Merge pull request #18605 from rsalvaterra/oc