Merge branch 'next/board-samsung-2' into next/board-samsung-3