CLOUD-92 changed