[Olena-patches] 2940: Fix bootstrap.