Merge pull request #12504 from eileenmcnaughton/yashi