V1.7.x

Merge of latest 1.7.x onto master.