Merge pull request #5252 from alexrp/profiler-stress-fixes