Add CLI, redev entities class, function and method
Merge remote-tracking branch 'origin/master'