ENG-5899 Review changes and rejoin fix.