Merge pull request #8323 from csukuangfj:csukuangfj-patch-8