Merge profiler branch