Merging with recent changes.