Branch merge for fixes in reconnect.