Merge branch 'wip/bugfix/12146-hybrid-with-xorriso' into wip/bugfix/12146-hybrid-with-xorriso+syslinux-fixes