Updates after merge.