Synchronise 2024.1 with upstream#158

priteau merged 2 commits intostackhpc/2024.1stackhpc/requirements:stackhpc/2024.1from

upstream/2024.1-2026-01-12stackhpc/requirements:upstream/2024.1-2026-01-12Copy head branch name to clipboard