Merge branch 'main' into deps-upgrade-core

Passed in 16m 2s
:pipeline:
:pipeline:buildkite-agent pipeline upload
Waited 2s
Ran in 5s
:golangci-lint: lint :lint-roller:
Waited 13m 11s
Ran in 1m 0s
:golang: go test
Waited 14m 14s
Ran in 53s
:github: upload PR reports
Waited 2s
Ran in 48s
Total Job Run Time: 2m 45s