Merge branch 'backport/jx/ci-ubuntu-fix' into maint-2.30