Fix #1199 #1085

Job	Run time
build_debian_bookworm	5m 17s
build_debian_bullseye	3m 43s
build_debian_buster	4m 15s
build_android	13m 21s
build_debian_sid	4m 5s
build_macos	7m 45s
build_raspios_bullseye_armhf	8m 39s
build_ubuntu_focal	3m 54s
build_ubuntu_jammy	3m 41s
build_windows	16m 22s
check_formatting	20s
check_spelling	15s
create_full_archive	0s
update_nightly_release	0s
	1h 11m 37s

Provide feedback