add shell delegate states
Merge branch 'develop' into feature/issue-3-move-api-calls-to-delegate-states
Merge branch 'feature/issue-3-move-api-calls-to-delegate-states' into develop
make unsubscribe work