Merge branch 'kd/cvsimport-avoid-invalid-tag'