Final additions before Merge.