Merge branch 'main' into deps-upgrade-core

Passed in 1m 22s
:pipeline:
:pipeline:buildkite-agent pipeline upload
Waited 2s
Ran in 4s
:golangci-lint: lint :lint-roller:
Waited 2s
Ran in 33s
:golang: go test
Waited 3s
Ran in 31s
:github: upload PR reports
Waited 2s
Ran in 40s
Total Job Run Time: 1m 49s