BS-7731, fixed erroneous test on Threads still active
Merge branch 'release-6.2.4'