Merged languages from upstream