Merge pull request #945 from fredzo/fix-#297 #1459

Job	Run time
Linux (ubuntu-22.04, standalone, false)	5m 6s
Linux (ubuntu-22.04, repo, false)	5m 16s
Linux (ubuntu-22.04, repo, true)	3m 9s
Linux (ubuntu-24.04, repo, true)	3m 24s
Linux (ubuntu-24.04, repo, false)	4m 27s
Linux (ubuntu-24.04, standalone, false)	4m 30s
	25m 52s

Provide feedback