Bring OrderedDict conversion in line with `develop` branch