Merge v1.7.x onto master