Merge branch-2 upstream changes