Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev