WIP: checkpoint synchronization
merge