CLOUD-239 updated start