Merge pull request from p2pu/2022-06-03-hotfix remove dictsort causing trouble