Merge "Connectivity: Fix map access" into pi-dev