[Matahari] [PATCH 2/2] - Support federated brokers