Backport of revision 62854
1 file changed