(cherry picked from commit f555d9992caabed1eff90a34fb57225ab0e32a9b)
Closes #31684 (cherry picked from commit ec31dc8d3ce302e42c26359adc894bd736a45fb2)