Merge pull request #3688 from alexrp/profiler-c9-fixes