CLOUDIFY-2073 initial commit