Merge branch 'release/tests_release'
Uses new view syntax
Merge branch 'hotfix/view_syntax' into develop