v2: fix divergent changes #3015

Job	Run time
Prepare Go modules cache	3m 13s
Smoke Tests	0s
macos-latest (AppSec disabled)	3m 44s
windows-latest (AppSec disabled)	6m 26s
macos-12 go1.23	13m 33s
ubuntu-latest-16-cores (AppSec disabled)	3m 8s
linux/amd64 golang:1.23-bookworm	3m 16s
macos-12 go1.22	12m 50s
linux/arm64 golang:1.23-bookworm	5m 30s
macos-14 go1.23	6m 48s
linux/amd64 golang:1.23-bullseye	3m 10s
macos-14 go1.22	6m 52s
linux/arm64 golang:1.23-bullseye	5m 11s
linux/amd64 golang:1.23-alpine	2m 52s
linux/arm64 golang:1.23-alpine	5m 0s
linux/amd64 golang:1.22-bookworm	3m 7s
linux/arm64 golang:1.22-bookworm	5m 46s
linux/amd64 golang:1.22-bullseye	3m 5s
linux/arm64 golang:1.22-bullseye	4m 50s
linux/amd64 golang:1.22-alpine	2m 53s
linux/arm64 golang:1.22-alpine	4m 29s
	1h 45m 43s

Provide feedback