Backport of r67988
1 file changed