Expand template argument type deduction #20206

Job	Run time
build_cmake (ubuntu:24.04, true, true)	5m 16s
build_make (alpine:3.23)	5m 55s
build_cmake (alpine:3.23, false, false)	3m 50s
build_make (ubuntu:25.10)	4m 52s
build_make (ubuntu:24.04)	4m 24s
build_cmake (ubuntu:25.10, true, true)	4m 29s
	28m 46s

Provide feedback