[Matahari] [PATCH] Revised Matahari broker initialization