[OTF:1619] LanguageResolver re-factor