Merge branch '21_MDL-25996_making_language_editing_terms_user_friendly' of git:/...