Merge "Fix data race" into nyc-dev