Add in feature that had changed on xtte package.
Merge branch '21601'
Fix typo.