BAC-1332 porting phalanx retry changes from previous release