Merge from Perforce
Fix the UTP script issue