Merge commit 'd01d0756f75e7a5b4b43764ad45b83c4340f11d6' into next-samsung