Post-rebase fixes #1821

Job	Run time
Autotools Debug Thread-Safety Workflows / GCC-debug-TS=enabled	4m 0s
Autotools Parallel Workflows / Parallel GCC-debug	4m 26s
Autotools Parallel Special Workflows / gcc REL parallel -Werror (build only)	4m 30s
Autotools Parallel Special Workflows / gcc DBG parallel -Werror (build only)	4m 3s
Autotools Special Workflows / gcc DBG v1.6 default API (build only)	5m 12s
Autotools Parallel Workflows / Parallel GCC-production	4m 49s
Autotools Special Workflows / gcc DBG v1.8 default API (build only)	5m 18s
Autotools Debug Workflows / GCC-debug-TS=disabled	13m 4s
Autotools aocc Workflows / aocc production	16m 55s
Autotools Intel Workflows / linux-oneapi production	13m 31s
Autotools Julia Workflows / julia production	6m 3s
Autotools nvhpc Workflows / nvhpc production	18m 35s
Autotools Release Workflows / GCC-production-TS=disabled	12m 52s
Autotools TestExpress Workflows / Autotools production Express Test Workflows	13m 8s
Autotools Release Thread-Safety Workflows / GCC-production-TS=enabled	4m 51s
Autotools Special Workflows / gcc DBG -Werror (build only)	4m 37s
Autotools TestExpress Workflows / Autotools debug Express Test Workflows	14m 34s
Autotools Special Workflows / gcc no deprecated symbols (build only)	5m 17s
Autotools Special Workflows / gcc DBG v1.10 default API (build only)	5m 14s
Autotools Special Workflows / gcc REL -Werror (build only)	5m 26s
Autotools Special Workflows / gcc DBG v1.12 default API (build only)	5m 6s
Autotools Special Workflows / gcc DBG v1.14 default API (build only)	4m 59s
	2h 56m 30s

Provide feedback