[#41535599] Refactor message bus initialization