CLOUD-111 fixed review comments