Backport grub fixes to 9.2