Merge remote branch 'origin/mika/do-not-build-initrd'