Support for Bond hub

There is a recent thread discussing this exact issue.