Merge "Use proper lock when accessing the generation registry" into nyc-dev