Merging recent changes from parent.