CLOUDIFY-2454-context-fix