Fix views
Merge branch 'refs/heads/feature/community' into develop