Merge pull request #5224 from alexrp/profiler-multiple-args