Functional Improvements for merging

- Adding in support for concat by locale
- Migrating functionality from dynamic_mappings to internal functionality
Merge branch 'functional_rewrite'