Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev