Merge "Use Geometry::QUAD() in UTC" into devel/master