Initial 1.7.4 merge.