Merge pull request #2015 from alexrp/profiler-roots-v2