Merge "Respond to API council feedback." into oc-dev