code reformat
Merge branch 'local_working' into cli_redesign