Merge "Deprecate producer/consumer usage: Step 2" into oc-dev