Fix handling saved views
Fix handling saved views
Merge branch 'hotfix/2.7.3' into develop

* hotfix/2.7.3: