Final changes before pull request.
One last merge.