Various new files
Merge branch 'hotfix/sorteddictionary'