Merge branch 'net-ethernet-ti-clean-up-and-optimizations'