Refs #10223 Attempt to fix Win7 build
Merge branch 'feature/10223_new_refl_ui_improvements' into develop