Merge pull request #12949 from eileenmcnaughton/activity_extract