Merging activity-completed event from master