Merged upstream