Merge "MAP: Fix MAP disconnect"