Merge changes for extended Plink diff