Auto-docking added