Merge pull request #4967 from kumpera/profiler-arg-cleanup