Merge branch 'develop' into 11912-edit-template-api #13921

Job	Run time
(Stable / JDK 21) Unit Tests	6m 29s
(Stable / JDK 21) Integration Tests	4m 49s
Coverage Report Submission	27s
Publish App Image / Build & Test	2m 19s
Publish App Image / Check for Secrets Availability	3s
Publish App Image / Package & Publish	-1s
	14m 6s

Provide feedback