Merge branch 'hotfix/bug-1' into develop
state aware status command
Merge branch 'develop'