Merge "Properly disconnect after skipping an operation." into pi-dev