Merge "Remove the old version of setAffiliationIds" into oc-dev