Merge pull request #6870 from alexvong1995/add-missing-tag