Merge "Explicitly deal with rejected offer operation"