Merge pull request #12994 from eileenmcnaughton/activity_extract