Merge from Perforce
Fix the bug in report test case