Merge from Perforce
Add the test case of enabling cluster redundancy
Merge from Perforce
Solve the conflict