Update #78 prepare BrokerNG