Merge branch 'main' into deps-upgrade-core

Passed in 12m 48s
:pipeline:
:pipeline:buildkite-agent pipeline upload
Waited 1s
Ran in 5s
:golangci-lint: lint :lint-roller:
Waited 10m 38s
Ran in 2m 5s
:golang: go test
Waited 11m 1s
Ran in 23s
:github: upload PR reports
Waited 1s
Ran in 40s
Total Job Run Time: 3m 12s