Merge from Perforce
Migrate codes from the 2.5 branch
Fix the script issue in the report test suite
Fix the script issue in the max config test suite
Fix the script issue in the report test suite
Migrate codes from the 2.5 branch
Fix the script issue