Merge "Improve reporting of bucketing reason"