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

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