CLOUD-24: minor