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

Job	Run time
Spotless scan	1m 4s
Check permissions orders	23s
Checkstyle scan	2m 18s
Check if all files end in newline	35s
Spotbugs scan	1m 58s
	6m 18s

Provide feedback