[Olena-patches] [PATCH 12/12] Improve bootstrap.