Issue #20044 Fix connect-xt-pg bug.