Backport of 1.6.4.2.2.3 from release22-maint branch.
1 file changed