OPAL-1883: Fixed Translation merge