Merge upstream v0.96.0 #1

Job	Run time
govulncheck	1m 1s
setup-environment	34s
checks	51s
test-coverage	2m 6s
lint	2m 6s
cross-build-collector (darwin, amd64)	40s
unittest-matrix (~1.22)	2m 16s
cross-build-collector (darwin, arm64)	41s
unittest-matrix (~1.21.5)	2m 5s
cross-build-collector (linux, 386)	39s
cross-build-collector (linux, amd64)	40s
cross-build-collector (linux, arm64)	45s
cross-build-collector (linux, ppc64le)	44s
cross-build-collector (linux, arm, 7)	37s
cross-build-collector (linux, s390x)	39s
cross-build-collector (windows, 386)	43s
cross-build-collector (windows, amd64)	40s
unittest	1s
	17m 48s

Provide feedback