Merge "[CVP] Add all cvp images to reclass"