Merge branch 'jn/fast-import-ondemand-checkpoint' into next