CLOUDIFY-1997 Merge code from contribution