Merge pull request #16551 from totten/master-ext-tags