Re-applied the changes from the legacy DebugCLI
Re-applied the changes from the legacy DebugCLI

adufilie/flex-falcon,greg-dove/flex-falcon,adufilie/flex-falcon,greg-dove/flex-falcon,greg-dove/flex-falcon,adufilie/flex-falcon,adufilie/flex-falcon,greg-dove/flex-falcon