Project: datamanagement
Issue DM-2342: Integrate changes from Events code review
Story points: 6