Merge "Don't crash on boot" into lmp-preview-dev