(subscriptions) refactoring
Merge branch 'origin/master'