Merge branch 'nes' into for-next