Merge branch 'geom-data' into HEAD