Merge "Fix ssid fetch"