Modify by Vin
Merge branch 'dev'