Pulling some reconnect related changes from other branches and updating client version