Changes after merge.