Fixes/improvements [#3710] Fix localization regression introduced in 1.8.4. List of contributors asie, Computerdores, ff66theone, Glease, Hawk777, repo-alt, RobertCochran, yut23