Merge pull request #13441 from mingshewhe/bug_12697