Latest commit before merging with master branch.