Merge pull request #11409 from AdmiralCurtiss/performance-tracker-refactorings Performance tracker refactorings extracted from PR #11348.
