Merge "Display one row item per Ethernet interface" into main