Dictionary support.
Merge pull request #10543 from beheim/master

Dictionary support.