Merge "Adapt CTS to API Council feedback" into oc-mr1-dev