Use full deprecation version
Merge pull request #13865 from BBosman/deprecated

Use full deprecation version