Merged files from upstream