Merge branch 'samsung/devel' into next/devel2