Merged various-additions-to-the-gem-geometry-interface