Closed jzheaux closed 2 weeks ago
Forward port of #15658
Closed in 0cab7c8f15ab98e97b10458d63ed3d85601b0903 and 1118b0ec63b87de00957f5a86bab499c9518d3f7
Forward port of #15658