Merge pull request #1856 from alexrp/profiler-improvements