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