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