Merge "Reduce rollovers of unique ID generator" into nyc-dev