Merge of 1.7.8 branch.