Merge "Move RunningTees singleton to cpp file." into main