CLOUD-130 changed order