Changes related to the recent merge.