Merge branch 'hotfix/1.0.3-1' into develop
adding cli box
Merge branch 'release/1.0.4'