PMO-2821:i18n and some polishing