- WIP on locale_fixes patch (parts already merged upstream)