Merge remote-tracking branch 'CT/V1.7'
Merge remote-tracking branch 'upstream/master' into V1.8