Merge branch 'next-samsung-board-v3.1' into next-samsung-board