Merge pull request #5274 from alexrp/profiler-call-contexts