Merge pull request #5063 from alexrp/profiler-format-changes