Merge "Cts V2 reporters and template" into nyc-dev