CLOUD-118 Applied review comments