CLOUDIFY-1944 To be or not to be