Merge "ChangeTags was backported to 1.25"