just merge some fix from offical
Merge remote-tracking branch 'origin/master'