Merge commit '75b72675ac021831d70d032fc4fd280f6619fb20' into vani's_branch
Merged
Refactored commandView
CHANGED HELPER
Merge branch 'vani's_branch' into linh-dev