Merge main into develop #6986

Job	Run time
formatting-and-quick-compile	45s
copyright-check	29s
compile	0s
e2e	0s
slow-tests	0s
build	0s
frontend-unit-tests	0s
integration-tests	0s
package-assembly	0s
	1m 14s

Provide feedback