Merge remaining changes from upstream