Merge branch 'main' into #2189-win-compatibility #51

Job	Run time
docker-security-build / prepare-env	4s
docker-security-build / docker-security	3m 33s
docker-security-build / docker-build	4m 17s
	7m 54s

Provide feedback