Merge pull request #13329 from eileenmcnaughton/activity_extract