Merge "LanguageServiceImpl logging vulnerability fix"