Merge r1746109 to the 1.7 branch.
5 files changed