Merge #121086 #121152 #121156 #2163

Job	Run time
docker_image_amd64	10m 7s
examples_orms	17m 15s
EXPERIMENTAL_acceptance	17m 7s
check_generated_code	10m 59s
EXPERIMENTAL_lint	27m 27s
EXPERIMENTAL_local_roachtest	33m 17s
EXPERIMENTAL_local_roachtest_fips	29m 6s
linux_amd64_build	9m 30s
linux_arm64_build	11m 6s
linux_amd64_fips_build	9m 36s
macos_amd64_build	12m 33s
EXPERIMENTAL_unit_tests	26m 50s
macos_arm64_build	11m 17s
windows_build	10m 27s
	3h 56m 37s

Provide feedback