Viewport and includes
Merge branch 'viewport-fixes'