Merge branch 'master' into develop
Add subscription feature
Merge branch 'develop'