Merge "Encapsulate determining the event purpose" into feature/zuulv3