Merge pull request #8570 from YI-BOYANG/master