Merge branch 'backport-ci-fedora-39' into ci-fedora-39