Merge Bard Changes from gobengo/streamhub-sdk