Merge branch 'jk/connect-symref-info-leak-fix' into maint