-Stale entity fix to the MultiThreadTestSuite
Merge remote-tracking branch 'origin/master'