Merge "Fixing repeated EH calls when client retransmits requests"