Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617' * commit '096a1e6c83d3638788468dfb21a3b4662745d617': Check for state before disconnecting.
Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617' * commit '096a1e6c83d3638788468dfb21a3b4662745d617': Check for state before disconnecting.