Merged with upstream and resolved renaming conflicts.