Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
fix merge errors