Merge branch 'hotfix/fix.folderskeys.being.dropped'
add return statement if download failed
Merge branch 'hotfix/fix.data' into develop