Update sync with latest XChange release.