backport change 55821 to release25-maint
1 file changed