RAMPART-446: Merge r1778769 to the 1.7 branch.
1 file changed