Merge pull request #15002 from demeritcowboy/activity-type-assignment-1116