Update branch with code review recommendations #12423

Job	Run time
Windows 11-arm/Visual C++ (btest test-basic test-tool)	15m 36s
Windows 2022/Visual C++ 2022 (check)	24m 20s
Windows 2025/Visual C++ 2022 (check)	28m 38s
Windows 2025/Visual C++ 2022 (test-bundled-gems)	26m 29s
Windows result	3s
	1h 35m 6s

Provide feedback