Merging with 1.x.