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

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