Merge pull request #31526 from tthvo/OCPBUGS-111704