Merge branch 'hotfix/v0.4.2a' into develop
Remove unsubscribe code.
Merge branch 'develop'