Merge pull request #5072 from alexrp/profiler-stability