Merge branch 'hotfix/fix.folder.tree'
don't delete old keys just yet

there  is a bug somewhere.
Merge branch 'hotfix/fix.folderskeys.being.dropped' into develop