Merge: Introduction of convex polygons in geometry + benchmarks