Merge "[VID] Uses new tpls for repos / images"