I can confirm grub2 from eoan-proposed fixes the issue and I'm able to boot both Windows and Linux on a system without SB and without shim.
I can confirm grub2 from eoan-proposed fixes the issue and I'm able to boot both Windows and Linux on a system without SB and without shim.