Synchronise 2025.1 with upstream#515

priteau merged 2 commits intostackhpc/2025.1stackhpc/kolla:stackhpc/2025.1from

upstream/2025.1-2026-01-26stackhpc/kolla:upstream/2025.1-2026-01-26Copy head branch name to clipboard