Apply changes regarding SOFA PR 5558 #375

Job	Run time
Run on ubuntu-24.04 with SOFA master	4m 14s
Run on macos-14 with SOFA master	2m 29s
Run on windows-2022 with SOFA master	8m 41s
Deploy artifacts	0s
	15m 24s

Provide feedback