Additional changes after merge.