Merge "Change listener to eth1"