Merge pull request #9486 from neheb/yk