Merge from Perforce
Fix the script issues
Merge from Perforce:
Fix the script issues
Fix the script issues
Fix the script issues
Fix the script issue
Fix the script issues
Fix the issues