Merge branch 'i40e'