CLOUDIFY-1826 Prepare to merge back to develop.