Merge "Address API council feedback." into oc-dev