Synchronise 2024.1 with upstream#543

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

upstream/2024.1-2026-04-01stackhpc/kayobe:upstream/2024.1-2026-04-01Copy head branch name to clipboard