Merge main into develop #5945

Job	Run time
copyright-check	27s
formatting-and-quick-compile	2m 0s
compile	3m 23s
integration-tests	12m 51s
build (11)	13m 52s
build (24)	12m 8s
package-assembly	4m 0s
slow-tests	13m 14s
e2e	10m 2s
	1h 11m 57s

Provide feedback