Merge pull request #31429 from dobsonj/OCPBUGS-99492