CLOUDIFY-1896 Disabled phase 1, enabled phase 3