#3570280: Fix code issues

Tom Keitelrequested to merge
issue/view_mode_switch-3570280:3570280-deprecated-code into 2.x

Closes #3570280

Merge request reports