Patch sent: https://lists.gnu.org/archive/html/grub-devel/2021-10/msg00138.html I tested locally without problem, extra test would also be helpful.