Copying changes from master branch.