Merged from master branch. As the final release merge.