CLOUD-216 fixed cs