Fix Mark2 Beta Bugs #1723

Job	Run time
unit_tests (3.8)	1m 38s
util_tests (3.8)	1m 6s
unit_tests (3.9)	1m 12s
util_tests (3.9)	1m 8s
unit_tests (3.10)	1m 17s
util_tests (3.10)	1m 31s
unit_tests (3.11)	1m 21s
util_tests (3.11)	1m 8s
unit_tests (3.12)	1m 32s
util_tests (3.12)	1m 15s
docker_build_tests / docker_build_tests	13m 54s
py_build_tests / py_build_tests	10s
py_build_tests / relative_path_tests	5s
	27m 17s

Provide feedback