Merge pull request #16697 from eileenmcnaughton/deprecate