- Update tags for new 1.17 and 1.18 content (#7891)