CLOUD-315 fixed decommission