Merge pull request #10261 from eileenmcnaughton/activitybackout