Merge "Cold Sim Issue Fix" into nyc-dev