Merge branch 'vendor/XZ' into HEAD