Merge "Set version to 1.0" into nyc-dev