Merge "Address API council comments" into oc-dev