Merge branch 'berlin_ethernet'