Merge pull request #13166 from eileenmcnaughton/misc