chore: sync main into develop (resolve conflicts) #1140

Job	Run time
pre-commit	19s
meta	28s
test-unit 3.9	2m 8s
test-unit 3.13	1m 58s
test-unit 3.12	2m 3s
test-unit 3.10	1m 55s
compliance-copyrights	29s
fossa-scan	1m 20s
test-unit 3.11	1m 59s
semgrep / sast-scan	49s
test-splunk (9.3.2, d8bb32809498, false, false)	3m 8s
test-splunk (9.4.0, 6b4ebe426ca6, true, false)	2m 40s
publish	1m 4s
	20m 20s

Provide feedback