[v11.x] backport #25087, #24962, #24931 and #25006

This is a backport of #25087, #24962, #24931 and #25006. I did not yet run the tests locally as compiling takes a while.

Checklist

• make -j4 test (UNIX), or vcbuild test (Windows) passes
• tests and/or benchmarks are included
• documentation is changed or added
• commit message follows commit guidelines