Merge "Refactored user-events protocol"