Fix the case of dictionaries over ebnet.
Merge branch 'ebnet', remote-tracking branch 'origin'