Expand template argument type deduction #20237

Job	Run time
build_make (ubuntu:24.04)	4m 27s
build_make (alpine:3.23)	6m 18s
build_cmake (ubuntu:24.04, true, true)	5m 32s
build_cmake (alpine:3.23, false, false)	4m 35s
build_make (ubuntu:25.10)	4m 59s
build_cmake (ubuntu:25.10, true, true)	5m 41s
	31m 32s

Provide feedback