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