Stefan kindly ran a regtest on s390 which looked OK as well.
I re-tested everything one more time and will commit soon. The patches were bootstrapped individually on x86 (and built on riscv) so I hope it's safe to not squash them.
Thanks for the guidance on that patch/series. -- Regards Robin