Changes for 1.7.2 -> 1.7.9

Incomplete changes from 1.7 R1 (1.7.2) to 1.7 R3 (1.7.9)