Added dictionary utilities
Merge commit '3b26db0b246c56565d3ae7fc6535fd6b59d3b881' into include-hack