Drop Z coordinate in fixtures
Merge branch 'switch_to_geom_2d'