Incorporating upstream changes