Merge "Adjust with changes in libxml2 upgrade" into main