Backport of bug 363593 to 2.2 stream
1 file changed