Merge pull request #10119 from eileenmcnaughton/deprecated