Merge branch 'clean-up-views' into 'develop'