Port #7352 (Update solution to reflect current state) from master to 2.0.x
Port #7352 (Update solution to reflect current state) from master to 2.0.x

johnbeisner/cli,johnbeisner/cli,dasMulli/cli,dasMulli/cli,livarcocc/cli-1,johnbeisner/cli,livarcocc/cli-1,dasMulli/cli,livarcocc/cli-1