test

Thread: merge [81791]-tools dir missing

Spirit: merging from trunk upto rev. 61489

Merge r62426 from ^/trunk

Reverted an accidental commit.

Merged changes from trunk (rev. 62450). Fixes #3876.