I cherry-picked the three patches to the 2.30 branch, with a little merge fixup in the last one as Rainer mentioned. No check failures for x86_64-elf or x86_64-linux either. I've committed them to the branch now. Thanks, Roland