Hi,
> Below you can find a patch that solves both problems. Feedback is welcome. Mathieu mentioned branches a while ago: https://lists.debian.org/debian-boot/2015/05/msg00271.html