Merge pull request #18445 from eileenmcnaughton/activity