Fix some bugs
Modify .gitignore
Merge from Perforce
Merge branch 'bug/migrate'