CLOUDIFY-2475 event touchups