Merge from master branch to api branch.