Start on boot
Merge branch 'boot'