Merge upstream/main, resolving conflicts #457

Job	Run time
StaticAnalysis (17)	5m 56s
Internal / UT & CodeCov (8)	6m 32s
Integrations / UT & CodeCov (8)	3m 37s
Controller / UT & CodeCov (11)	8m 31s
Controller / UT & CodeCov (8)	8m 7s
Clients / UT & CodeCov (8)	12m 3s
Clients / UT & CodeCov (17)	13m 47s
Controller / UT & CodeCov (17)	7m 47s
Internal / UT & CodeCov (17)	7m 34s
Server / UT & CodeCov (17)	11m 55s
Clients / UT & CodeCov (11)	12m 5s
Server / UT & CodeCov (8)	8m 39s
Router / UT & CodeCov (8)	5m 29s
Internal / UT & CodeCov (11)	6m 42s
Router / UT & CodeCov (17)	4m 29s
Integrations / UT & CodeCov (17)	2m 7s
Router / UT & CodeCov (11)	4m 12s
Server / UT & CodeCov (11)	12m 48s
ValidateGradleWrapper	11s
Integrations / UT & CodeCov (11)	2m 13s
StaticAnalysisAndUnitTestsFailureAlert	0s
	2h 24m 44s

Provide feedback