Merge #120844 #120849 #1472

Job	Run time
docker_image_amd64	6m 33s
check_generated_code	10m 48s
examples_orms	10m 26s
EXPERIMENTAL_acceptance	5m 42s
EXPERIMENTAL_lint	21m 17s
EXPERIMENTAL_linux_amd64_build	5m 46s
EXPERIMENTAL_linux_amd64_fips_build	5m 42s
EXPERIMENTAL_linux_arm64_build	5m 11s
EXPERIMENTAL_local_roachtest	17m 8s
EXPERIMENTAL_local_roachtest_fips	27m 29s
EXPERIMENTAL_unit_tests	25m 5s
macos_amd64_build	5m 54s
macos_arm64_build	6m 5s
windows_build	4m 44s
	2h 37m 50s

Provide feedback