Changed dict for OrderedDict.
Merge branches 'ordered-dict' and 'develop' into develop