Merge pull request #2297 from Mab879/backport_2291 #85

Job	Run time
Build on Windows	18m 14s
Build, Test on Fedora 40 (Container)	9m 54s
Build, Test on Ubuntus (ubuntu-22.04)	9m 20s
	37m 28s

Provide feedback