fix some bug
Merge remote-tracking branch 'origin/clear' into clear
fix some bug