Merge branch 'feature/jason-view-render' into 'develop'