This will need (a) backport to 8.10 (b) backport to 9.0 (c) forwardport to master
Fixes #19751 (closed)