Merge branch 'main' into dynamic-resource-settings #1489

Job	Run time
Check if all files end in newline	32s
Spotless scan	1m 22s
Checkstyle scan	2m 36s
Check permissions orders	25s
Spotbugs scan	2m 18s
	7m 13s

Provide feedback