[Matahari] [PATCH] - Broker initialization update v2