Synchronise 2025.1 with upstream#486

Alex-Welsh merged 2 commits intostackhpc/2025.1stackhpc/kayobe:stackhpc/2025.1from

upstream/2025.1-2025-10-20stackhpc/kayobe:upstream/2025.1-2025-10-20Copy head branch name to clipboard