Merge pull request #15906 from eileenmcnaughton/odd