Merge pull request #21494 from eileenmcnaughton/compat