Non happy-path fixes
Fix for read dictionary tag
Giving credits where due
Merge branch 'master' into cmake_support