Merge branch 'rid-w-1-warnings-in-ethernet'