Merge from Perforce
Merge from Perforce
Modify the script due to behavior change