Merge pull request #2128 from jwillemsen/jwi-emb2