Merge branch 'master' into DavidNg_Local
Creating project tag should not required
Fix import error
Merge branch 'DavidNg_Local'