Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev