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

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