Merge from structural changes.