Refs #10222 Fix broken unit test
Merge branch 'feature/10222_refl_gui_review_changes' into develop