Add rest of new commits from upstream