Apply changes from SOFA PR #6117 #10

Job	Run time
Run on macos-14 with SOFA master	2m 47s
Run on ubuntu-22.04 with SOFA master	1m 27s
Run on windows-2022 with SOFA master	8m 53s
Deploy artifacts	0s
	13m 7s

Provide feedback