[v11.x] backport of #25105, #25149 and #25150
Backport of #25105, #25149 and #25150.
Checklist
-
make -j4 test
(UNIX), orvcbuild test
(Windows) passes -
tests and/or benchmarks are included -
documentation is changed or added -
commit message follows commit guidelines