Merge "Fix cannot add language" into tm-dev