Merge branch 'master' to R1.10