Merge branch 'nps_enet-fixes'