Merge branch 'netif_rx-part3'