Merge "UTC Increase builder line coverage" into devel/master