Fix random tests
Merge remote-tracking branch 'remotes/origin/master' into BS-6672_Log_enhancements