Feature/multilingual phase iii - Test Merge