Merge branch 'main' into discovery-dial-timeout #1935

Job	Run time
docker-security-build / prepare-env	5s
docker-security-build / docker-security	3m 25s
docker-security-build / docker-build	32m 52s
	36m 22s

Provide feedback