fix bug
Merge remote-tracking branch 'origin/v3.0' into v3.0