Merge "[CVP] Fixed cleaning up cvp containers"