[Matahari] Patch review on broker automated federation