Refs #10537 Fix problems found by buildserver
Merge branch 'feature/10537_variable_initial_view_vates' into develop