Merge remote-tracking branch 'upstream/v1.2' into v1.2