Re #6371. Forgot about the test for previous commit.
Re #6371. Be sure not to try and use an empty proton charge log.
Merge branch 'feature/6371_step_scan_gui' into develop