Draft: #3626765 "Fix deprecations"

Tom Keitelrequested to merge
issue/view_mode_switch-3626765:3626765-fix-deprecations into 3.x

Closes #3626765

Merge request reports