Merge "Add vectors within resources back behind an API" into mnc-ub-dev