merged final upstream changes