Merge "Enforce contigious but unordered buckets" into tm-dev