Re #7833. Adding new mandi geometry.
Merge remote branch 'origin/feature/7833_mandi_geometry'