Added viewport
Merge branch 'staging'