Merge pull request #14425 from eileenmcnaughton/form_clean