Merge from Perforce
Migrage codes from 2.1 branch