Merge "Fix 2g and 3g ConnectionEvent" into main