Merge branch 'main' into standalone-resource-authz #1345

Job	Run time
Check permissions orders	19s
Check if all files end in newline	38s
Spotless scan	59s
Checkstyle scan	2m 7s
Spotbugs scan	1m 54s
	5m 57s

Provide feedback