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

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