backport of 64096
1 file changed