Merge branch 'view-impl-quad'