Merging from master
Fixed merge conflicts from dsuch-f-gh102-http-pub-sub