Merge pull request #2645 from alexrp/profiler-stability