Modifications to support sending out-of-order responses in some scenarios