Refs #10301 Fix broken unit tests
Merge branch 'feature/10301_refl_ui_scale_column_double' into develop