Merge "Fix PO provisioning for COPE" into sc-dev