pull in upstream xsync changes