CLOUDIFY-2210 - recommit.