Merge remote-tracking branch 'origin/1.6.6-rc2' into 1.7