Merge #121556 #2856

Job	Run time
EXPERIMENTAL_acceptance	7m 14s
check_generated_code	7m 59s
docker_image_amd64	5m 28s
EXPERIMENTAL_lint	21m 18s
examples_orms	12m 9s
EXPERIMENTAL_local_roachtest	21m 55s
EXPERIMENTAL_local_roachtest_fips	27m 20s
linux_amd64_build	4m 44s
linux_amd64_fips_build	4m 25s
linux_arm64_build	4m 55s
macos_amd64_build	5m 6s
EXPERIMENTAL_unit_tests	13m 44s
windows_build	4m 15s
macos_arm64_build	5m 16s
	2h 25m 48s

Provide feedback