Bugfix: uniqueIdInternal is still needed somewhere inside the Broker.