Merge "MapClient disconnect timeout"