Disconnectability1 changes merged into master