Merge "Remove delay with auto connection."