Backport of r52236
1 file changed