https://cloudifysource.atlassian.net/browse/CFY-1640