Migrate records in mix to maps.
Merge pull request #2229 from MSch/mix-maps

Migrate records in mix to maps.