Merge remote-tracking branch 'upstream/main' into multiple-resource-type #1507

Job	Run time
Check if all files end in newline	33s
Spotless scan	1m 21s
Check permissions orders	25s
Checkstyle scan	2m 52s
Spotbugs scan	2m 15s
	7m 26s

Provide feedback