merging v1.7.x with master