Merge pull request #848 from micmac1/dongle-2022