CLOUD-102 fixed review comments