Merge deploy changes from 1.0.7 so 1.1.0 can be deployed to OSS