Merge "Remove data dropping as an invalid bucket case"