CLOUDIFY-1726 - Ported to 2.6.1