Copy upstream changes
Add content