Merge from Perforce
Merge from Perforce
Merge from Perforce
Add the test suite restoration mechanism