Merge pull request #5062 from alexrp/profiler-library