Merge "Introduce concept of DockUser"