Final changes before the merge.