(subscription) add: add and remove subscription
Merge branch 'origin/master'