Merge languages branch