VG-1599: SDO Geometry Support

Also includes improvements for VG-1968.