Merge branch 'mh/fast-import-get-mark'