CLOUDIFY-2222 more work