Merge pull request #18221 from civicrm/eileenmcnaughton-patch-1