Fixes for booting

Merged
UT
1y ago
+456-102

No description provided on this pull request.