Merge #19777 #21

Job	Run time
tools-build (benchmark_udp, dist/tools)	18s
tools-build (bossa-1.8, dist/tools)	24s
tools-build (bossa-1.9, dist/tools)	28s
tools-build (bossa-nrf52, dist/tools)	27s
tools-build (calc_spi_scalers, cpu/kinetis/dist)	17s
tools-build (clk_conf, cpu/stm32/dist)	16s
tools-build (edbg, dist/tools)	20s
tools-build (ethos, dist/tools)	18s
tools-build (fixdep, dist/tools)	18s
tools-build (flatc, dist/tools)	1m 25s
tools-build (lpc2k_pgm, dist/tools)	18s
tools-build (mosquitto_rsmb, dist/tools)	26s
tools-build (riotboot_serial, dist/tools)	19s
tools-build (setsid, dist/tools)	17s
tools-build (uhcpd, dist/tools)	18s
tools-build (zep_dispatch, dist/tools)	18s
tools-build-success	1s
	6m 28s

Provide feedback