ME0 Geometry

* Merge related branches