Feature/direct boot