Merge from Perforce
Merge from Perforce
Add the test case of setting the configuration by CLI
Merge branch 'imp/clb'