Merge branch 'main' into dependabot/go_modules/github.com/docker/go-c…

Merge branch 'main' into dependabot/go_modules/github.com/docker/go-c… #558