Aligned branch internationalization with latest changes in master