Merge "[AWARE] Remove match style API" into oc-dev