Merge "Upgrade expat to R_2_6_2" into main