Merge pull request #9048 from annando/fix-tag-scheme