Backport of bug 363593 to 2.1 stream
1 file changed