Re #7833. Adding new mandi geometry.
Merge branch 'feature/7833_mandi_geometry' into develop