CAAERS-7043, updated migrator and synchronizer