Merge "Revert "Report multiple in-process primary connections"" into main