Final changes for branch.