Merge branch 'bc/connect-plink'