[#48956739] Resolve client/server inconsistency between bins and buckets