Refactor a View spec
Merge branch 'master' into regions