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

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