Latest commits before merging with master branch.