Merge from Perforce
Fix the script issues