Merge branch 'next/devel-samsung' into next/devel-samsung-2