Address review comments #6274

Job	Run time
Static Analyzer - Non Diff Aware	36s
Static Analyzer - Diff Aware	39s
Check licenses	44s
Build and test (14)	1m 28s
Build and test (16)	1m 27s
Build and test (18)	1m 20s
Test standalone binary in macOS	2m 18s
Test standalone binary in ARM macOS	2m 24s
Build and test (20)	1m 17s
Test standalone binary in ARM ubuntu	1m 58s
Test standalone binary in windows	3m 44s
Test standalone binary in ubuntu	1m 44s
End-to-end test the package	0s
	19m 39s

Provide feedback