Merge branch 'main' into dependabot/npm_and_yarn/all-5d1d6bed66 #1942

Job	Run time
Tests Matrix (Windows) (src/test/container-features/containerFeaturesOCI.test.ts)	4m 9s
Tests Matrix (Windows) (src/test/container-features/generateFeaturesConfig.test.ts)	3m 55s
	8m 4s

Provide feedback