Merged upstream. Fixed conflicts.