Merge from Perforce
Add the test case to generate mass criteria