Merge "Switch usermap from key to instanceId." into main