Merge pull request #18520 from rsalvaterra/oc-bump