Merge branch 'bc/connect-plink' into maint