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

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