Refactoring CLI commands with new generic implementation
Merge remote-tracking branch 'origin/master'