Merge "Remove Geometry::QUAD() usage in Toolkit" into devel/master