- Support disconnect / reconnect on primary side; with some refactoring and cleanup work.