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