Merge pull request #31515 from ardaguclu/resilient-oc-rsh