CLOUD-39 fixed review comments