Merge "Sync the code with master branch" into sc-dev