Merge "UTC Builder coverage" into devel/master