Merge "Cold Sim issue fix" into nyc-dev