Merge pull request #1873 from weihanglo/dont-create-label

Merge pull request #1873 from weihanglo/dont-create-label #5086