Merge "Update Tag to use TagCommand API"