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