v2: fix divergent changes #3025

Job	Run time
Prepare Go modules cache	17s
Smoke Tests	0s
macos-latest (AppSec disabled)	3m 37s
windows-latest (AppSec disabled)	6m 31s
macos-12 go1.23	13m 35s
linux/amd64 golang:1.23-bookworm	3m 20s
macos-12 go1.22	14m 39s
ubuntu-latest-16-cores (AppSec disabled)	2m 58s
linux/arm64 golang:1.23-bookworm	5m 20s
macos-14 go1.23	6m 23s
linux/amd64 golang:1.23-bullseye	3m 21s
macos-14 go1.22	5m 33s
linux/arm64 golang:1.23-bullseye	5m 24s
linux/amd64 golang:1.23-alpine	3m 25s
linux/arm64 golang:1.23-alpine	5m 15s
linux/amd64 golang:1.22-bookworm	3m 20s
linux/arm64 golang:1.22-bookworm	5m 48s
linux/amd64 golang:1.22-bullseye	3m 8s
linux/arm64 golang:1.22-bullseye	5m 16s
linux/amd64 golang:1.22-alpine	3m 20s
linux/arm64 golang:1.22-alpine	4m 45s
	1h 45m 15s

Provide feedback