Merge "Change the buffer exhausted policy to drop instead of stall and abort." into main