Refactor LegacyOutputTracker: eliminate code duplication
Merge branch 'master' into legacy-output-tracker