CVS must be component in larger gateway upgrade