subscriber fixes and add create subscriber
Merge origin/master
subscriber fixes and add create subscriber