Merge pull request #5210 from alexrp/profiler-runtime-settings