Fsfw cli

Merging changes