Merge "Fix concurrent use of Random instance" into nyc-dev