Resolve merge conflicts in #1776 #4320

Job	Run time
Check for syntax errors	11s
Check RST syntax	10s
Validate Sampledata & User Guide	7m 15s
Check sdist (3.9, windows-latest)	3m 47s
Check sdist (3.9, macos-13)	2m 0s
Check sdist (3.10, windows-latest)	2m 39s
Run Workbench Tests (windows-latest)	3m 38s
Check sdist (3.10, macos-13)	1m 40s
Run Workbench Tests (macos-13)	3m 23s
Run model tests (3.9, windows-latest)	7m 43s
Check sdist (3.11, windows-latest)	3m 16s
Run model tests (3.9, macos-13)	5m 30s
Check sdist (3.11, macos-13)	1m 31s
Run model tests (3.10, windows-latest)	9m 2s
Check sdist (3.12, windows-latest)	3m 50s
Build binaries (macos-13)	15m 52s
Run model tests (3.10, macos-13)	5m 28s
Check sdist (3.12, macos-13)	1m 24s
Build binaries (windows-latest)	11m 54s
Run model tests (3.11, windows-latest)	8m 49s
Check sdist (3.13, windows-latest)	3m 37s
Run model tests (3.11, macos-13)	5m 23s
Check sdist (3.13, macos-13)	2m 8s
Build sampledata archives	4m 7s
Run model tests (3.12, windows-latest)	8m 47s
Run model tests (3.12, macos-13)	4m 48s
Run model tests (3.13, windows-latest)	8m 14s
Run model tests (3.13, macos-13)	4m 58s
	2h 21m 4s

Provide feedback