Fix failed merge
Merge branch 'cli' into wcfSetupCli