Merge from Perforce
Fix the script issue in the SoftGRE test suite