Synchronise 2023.1 with upstream#146

priteau merged 2 commits intostackhpc/2023.1stackhpc/nova:stackhpc/2023.1from

upstream/2023.1-2025-01-20stackhpc/nova:upstream/2023.1-2025-01-20Copy head branch name to clipboard