Merge remote-tracking branch 'samsung/for-next'