(subscription) minor changes
Merge branch 'origin/master'