Re #6371. Further improvement to error messages.
Merge branch 'feature/6371_step_scan_gui' into develop