Merge "Add UTCs for public-api" into devel/master