Merge "connect/disconnect is now deprecated."