Merge branch 'main' into joshspicer/enforce-Feature-dir-name-match #3418

Job	Run time
CLI	38s
OCI Implementation Registry Compatibility	1m 22s
Tests Matrix (src/test/container-features/containerFeaturesOrder.test.ts)	51s
Tests Matrix (src/test/container-features/e2e.test.ts)	3m 38s
Tests Matrix (src/test/container-features/featuresCLICommands.test.ts)	2m 55s
Tests Matrix (src/test/cli.build.test.ts)	9m 19s
Tests Matrix (src/test/cli.exec.buildKit.1.test.ts)	4m 41s
Tests Matrix (src/test/cli.exec.buildKit.2.test.ts)	5m 12s
Tests Matrix (src/test/cli.exec.nonBuildKit.1.test.ts)	4m 51s
Tests Matrix (src/test/cli.exec.nonBuildKit.2.test.ts)	5m 18s
Tests Matrix (src/test/cli.test.ts)	58s
Tests Matrix (src/test/cli.up.test.ts)	5m 7s
Tests Matrix (src/test/imageMetadata.test.ts)	5m 42s
Tests Matrix (src/test/container-features/containerFeaturesOCIPush.test.ts)	52s
Tests Matrix (--exclude src/test/container-features/containerFeaturesOrder.test.ts --exclude src/...	6m 57s
Tests	0s
	58m 21s

Provide feedback