Merge pull request #1926 from alexrp/profiler-improvements