Merge "Addess API council comments" into oc-dev