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

This reverts commit ecdd926b249b9ec3fb5ae898c8fa1d3ec395c66b.
Rebase from 'upstream'
Trimmed the branch to only the message_store_map_switcher sub directory