#722 - add broker-oriented features