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

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