Merge before Andy leaves.