Merge branch 'mh/fast-import-optimize-current-from' into maint