Backporting from 70x

* from Sunanda's gem-geometry branch