Merge branch '1540_tarfs_for_xz'