Merge "Handle buffer orientation when rejecting buffers via blast"