Merge pull request #14850 from 1715173329/xr-mter