Merge pull request #2269 from jwillemsen/jwi-x801