Merge branch 'view-scaffolding'