Merge branch 'viewport' into docking