Merge upstream v0.96.0 (#11) #2

Job	Run time
govulncheck	59s
setup-environment	34s
checks	40s
lint	2m 7s
cross-build-collector (darwin, amd64)	38s
test-coverage	7s
cross-build-collector (darwin, arm64)	37s
unittest-matrix (~1.22)	2m 2s
cross-build-collector (linux, 386)	39s
unittest-matrix (~1.21.5)	2m 9s
cross-build-collector (linux, amd64)	45s
cross-build-collector (linux, arm64)	38s
cross-build-collector (linux, ppc64le)	40s
cross-build-collector (linux, arm, 7)	36s
cross-build-collector (linux, s390x)	36s
cross-build-collector (windows, 386)	37s
cross-build-collector (windows, amd64)	46s
unittest	1s
	15m 11s

Provide feedback