Merged upstream changes with own