Merge from Perforce
Merge branch 'master' of github.com:Everett6802/scg_cambridge_21
Migrate codes from the 2.5 branch