Merge branch 'cr/cvsimport-local-zone'