Backporting from 70x
Merge pull request #1681 from ianna/gem-geometry

Backporting from 70x