Re #6371. Well it worked for me...
Merge branch 'feature/6371_step_scan_gui' into develop