Merge from Perforce
Fix the script issue
Fix the script issues in the Multi-Cluster test suite