Added geometry switch. This resolves #8045
Merge branch 'feature/8045_moving_cleaning_function' into develop