CLOUDIFY-2539 hotfix