Backport fix for #10126
1 file changed