Merge pull request #10581 from eileenmcnaughton/deprecated4