ENG-5259: Rebalance and rejoin