Merge branch 'Milestone-2' into event-related-services