Synchronise 2024.1 with upstream#539

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

upstream/2024.1-2026-03-30stackhpc/kayobe:upstream/2024.1-2026-03-30Copy head branch name to clipboard