Merge "Minor re-arrangement to serve the needs for perf 3.12.0"