Merge remote-tracking branch 'upstream/1.7.x' into 1.7.x