Merge "MAP Client Exception at shutdown"