Merge branch 'fk/maint-cvsimport-early-failure' into maint