Merge #121458 #2710

Job	Run time
EXPERIMENTAL_acceptance	11m 36s
docker_image_amd64	5m 23s
check_generated_code	8m 44s
examples_orms	13m 9s
EXPERIMENTAL_lint	23m 55s
EXPERIMENTAL_local_roachtest	23m 25s
EXPERIMENTAL_unit_tests	23m 51s
linux_amd64_build	7m 11s
EXPERIMENTAL_local_roachtest_fips	27m 27s
linux_amd64_fips_build	8m 3s
linux_arm64_build	9m 15s
macos_amd64_build	7m 46s
macos_arm64_build	8m 36s
windows_build	8m 10s
	3h 6m 31s

Provide feedback