Merge pull request #16439 from eileenmcnaughton/part_odd