merged languages from upstream