Fix #9355 #11415

Job	Run time
Linux package	3m 54s
Bundle test (ubuntu-latest)	2m 31s
Test ./dev.sh and benchmark	1m 36s
Linux (python=3.10 cc=gcc sanitize=0)	1m 54s
macOS Brew	5m 28s
Bundle test (macos-latest)	3m 47s
Linux (python=3.12 cc=clang sanitize=1)	2m 41s
Linux (python=3.11 cc=gcc sanitize=1)	1m 47s
	23m 38s

Provide feedback