Merge "Fix uid map to be simpler and fix partial bucket." into pi-dev