Merge branch 'r8152'