Refs #10537 REvert changes on develop
Merge branch 'feature/10537_variable_initial_view_vates' into develop