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

This reverts commit fb6e5a4ab335600f8fb6529302581f0f040a6c15.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the map_merger sub directory