Merge pull request #1588 from apache/tanzhongyi003-patch-4