Termination conditions when receiving multiple acks
Merged bug25905 into stable
Merged stable into default