CLOUD-229 initial-commit