Merge from upstream new files.