Merge branch 'main' into manual-puback #416

Job	Run time
raspberry (raspbian-bullseye)	34m 25s
linux-musl-arm (alpine-3.16-armv7)	2h 7m 55s
linux-musl-arm (alpine-3.16-arm64)	1h 17m 21s
	3h 59m 41s

Provide feedback