Merge "Fix unsynchronized access to model hashmap" into nyc-dev