Bug #1713535 backport.
1 file changed