Merge "MapClient compatibility updates"