CLOUDIFY-2148 attempt