Re #6371. Temporarily remove assert while testing live.
Merge branch 'feature/6371_step_scan_gui' into develop