Merge pull request #359 from rlm2002/fenrir #264

Job	Run time
Linux x86 32-bit (Zulu JDK 17, --enable-jni --enable-all --disable-asm)	3m 7s
Linux x86 32-bit (Zulu JDK 17, --enable-jni --disable-asm)	2m 57s
	6m 4s

Provide feedback