Merge branch 'refactor/subscription' into 'develop'