re #8435: Ensure geometry correction gets the correct information
Merge branch 'feature/8435_redesign_load_data' into develop