[sdk] R1 branch merged into master