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