Merge branch 'cycles-views' into 'develop'