Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x