Merge from Perforce
Fix the script issue