Fix typecast error in controller
Merge branch 'hotfix/controller-typecast-error'
Fix merge conflict
Merge branch 'release/2'
Merge branch 'release/r3'
Work on cli app