[Backport] Backport #16306 to 2.x #16314
+5
−2
Merged
Loading