Merge pull request #14434 from eileenmcnaughton/activity_form