Merge with upstream latest commit