Revert "Trimmed the branch to only the map_merger sub directory"

This reverts commit c1b741ef1e8bf38e36b76d9999a25f953406722e.
Rebase from 'upstream'
Trimmed the branch to only the map_merger sub directory