Merge "MapClient compatibility updates" into rvc-dev