Merge 25.1.x
back into main
#5591
+20
−46
Merged
25.1.x
back into main
#5591