Fixes #14264 - improve primary interface selection
(cherry picked from commit 308f611d9bb17173588a6f59c7a914b551923a7b)
Fixes #14264 - improve primary interface selection
(cherry picked from commit 308f611d9bb17173588a6f59c7a914b551923a7b)