Merge pull request #13768 from eileenmcnaughton/activity_yay