Merge pull request #3701 from alexrp/profiler-c9-fixes-4.8