Merged from master branch.