Now supports the merge from Eric.