Apply changes from SOFA PR #6117 #80

Job	Run time
Run on windows-2022 with SOFA master	7m 3s
Run on ubuntu-22.04 with SOFA master	2m 31s
Run on macos-14 with SOFA master	3m 9s
Deploy artifacts	0s
	12m 43s

Provide feedback