Add upstream changes