PSDLE - Localization

Sync with master.