Merge pull request #17981 from eileenmcnaughton/merge_form