Merge pull request #12566 from zhanhb/which