Merge branch 'fc/fetch-with-import-fix' into maint