CLOUDIFY-1746 fix bugs