Merge pull request #1943 from alexrp/profiler-improvements