Merge "Upgrade expat to R_2_6_0" into main