Merge "[AWARE] Remove Publish/Subscribe Count configuration"