Merge branch 'bk/maint-cvsexportcommit' into maint