Merge "Fix out-of-bounds write past end of buckets on long transactions"