merged DeploymentCreator from master