Considering target language for translation retrieval. Live tests pending.
Merge origin/master