Merge branch 'nw/maint-cvsexportcommit'