Merge "Remove deprecated extension "tag" and "tag-ext""