CLOUD-293 duplication removed