extract TranslationPrefixRetriever
Merge origin/master