Develop master to 5.03n

Caution: Big amount of translate id changes may cause problems on different version usage!