Merge "More Profiler class refactoring"