Merged Changes from DockableViewPort