Merge "Sync UTC harness" into devel/master