Revert "Revert "Commit from xiaofan""

This reverts commit e94e8cec12369b03ce1eb6aa1ded03731c592143.
Commit from xiaofan to test Toan's laptop
Merge remote-tracking branch 'origin/master'