Adding upstream changes