Integrate with other changes.