Update project with upstream changes from framework