Fix for bug in dict parsing.
Merge branch 'hotfix/md_creds'