diff --git a/AUTHORS b/AUTHORS
index d0661675241..00f56d31478 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,10 +20,12 @@
 #   python ./tools/utils/authors_git_gen.py
 
 # BEGIN individuals section.
+1P2D <me@1p2d.com>
 20kdc <asdd2808@gmail.com>
 Aaron Carlisle <carlisle.aaron00@gmail.com>
 Aaron Franke <arnfranke@yahoo.com>
 Abdelrahman <said.abdelrahman89@gmail.com>
+Abdul Moeed Bhatti <abdul_moeed123@outlook.com>
 Adam Nydahl <Loginer>
 Adarsh TS <tsadarsh0707@gmail.com>
 Adi Sage <adisage.connect@gmail.com>
@@ -33,12 +35,14 @@ Adrian Newton <TFS>
 Ahmad Rifai <riff.blend@gmail.com>
 Aidan Davey <ShadowDragon>
 Aidan Haile <tactical_fluke>
+Aimee Wu <aimeewu@umich.edu>
 Aki Sakurai <akisakurai@noreply.localhost>
 Alan Babu <alanaman>
 Alan Troth <Al>
 Alaska <alaskayou01@gmail.com>
 Alberto Pilotto <a.pilotto@icloud.com>
 Alberto-Luaces <alberto-luaces@noreply.localhost>
+Aldo Bleeker <aldo-bleeker@noreply.localhost>
 Alejandro Conty Estevez <conty@yafray.org>
 Aleksandr Zinovev <roaoao@gmail.com>
 Aleksi Juvani <aleksijuvani>
@@ -76,6 +80,7 @@ Andras-Borsanyi <andras-borsanyi@noreply.localhost>
 Andre Susano Pinto <andresusanopinto@gmail.com>
 Andrea Beconcini <beco>
 Andrea Weikert <elubie@gmx.net>
+Andrea-Lanaro <andrea.blimp839@passinbox.com>
 Andreas Bergmeier <abergmeier>
 Andrej730 <azhilenkov@gmail.com>
 Andres Stephens <ondraise15@hotmail.com>
@@ -89,7 +94,7 @@ Andrii Symkin <pembem22>
 Andy Beers <acbeers1@gmail.com>
 Andy Goralczyk <andy@blender.org>
 Angel Bueno <angelbpineda>
-Angus Stanton <abstanton>
+Angus Stanton <angusstanton225@gmail.com>
 Anish Bharadwaj <bharadwajanish@gmail.com>
 Ankit Meel <ankitjmeel@gmail.com>
 Ankur Deria <DAnkur>
@@ -98,6 +103,7 @@ Anthony Eriksson <Kony>
 Anthony Roberts <anthony.roberts@linaro.org>
 Anton Khirnov <anton@khirnov.net>
 Anton Raves <Memento>
+Anton Stuk <sigman@ioupg.com>
 Anton Stötzer <blendermusic>
 Antonio Vazquez <blendergit@gmail.com>
 Antony Riakiotakis <kalast@gmail.com>
@@ -108,6 +114,7 @@ Arius-Cr <arius-cr@qq.com>
 Arnaud Degroote <arnaud.degroote@isae-supaero.fr>
 Arno Mayrhofer <azrael3000>
 Arto Kitula <arto.kitula@gmail.com>
+Aryan Verma <aryan.verma@adypu.edu.in>
 Arye Ramaty <aryeramaty@gmail.com>
 Arystanbek Dyussenov <arystan.d@gmail.com>
 Asad-ullah Khan <kh4n>
@@ -117,6 +124,7 @@ Attila Afra <attila.t.afra@intel.com>
 Aurel Gruber <aurel.gruber@infix.ch>
 Aurel Wildfellner <aurel.w@gmail.com>
 Aurelien Jarno <aurel32>
+Avotosui <avotosui@gmail.com>
 Ayoub ibn Muhammad <cl3m3c7@riseup.net>
 Azeem Bande-Ali <azeemba>
 Baardaap <blender@aaltjegron.nl>
@@ -138,6 +146,7 @@ Benoit Bolsee <benoit.bolsee@online.be>
 Bernhard M. Wiedemann <bwiedemann@suse.de>
 Bill Currie <bill@taniwha.org>
 Bill Spitzak <bills@sidefx.com>
+Bipin Yadav <bipinyadav3175@gmail.com>
 Blastframe <kevin@blastframe.com>
 Blazer <breakingspell@gmail.com>
 Bogdan Nagirniak <bodyan@gmail.com>
@@ -155,6 +164,7 @@ Casey Bianco-Davis <caseycasey739@gmail.com>
 Casey Corn <cmccad@yahoo.com>
 Chad Fraleigh <chadf@triularity.org>
 Chao Li <chaolinyc@gmail.com>
+Charbel Nicolas <charbel@fastmail.org>
 Charles Flèche <charles.fleche@ubisoft.com>
 Charles S <chuckiels2011@gmail.com>
 Charles Wardlaw <cwardlaw@nvidia.com>
@@ -184,6 +194,7 @@ Colby Klein <shakesoda>
 Colin Basnett <cmbasnett@gmail.com>
 Colin Marmond <kdblender@gmail.com>
 Corbin Dunn <corbin>
+Criss-Ivana <criss.ivana@gmail.com>
 Csaba Boncsér <geochuder>
 Cyrax <cyrax.iiit@gmail.com>
 Cédric Paille <cedricp>
@@ -198,19 +209,23 @@ Damien Plisson <damien.plisson@yahoo.fr>
 Dan Eicher <dan@eu.phorio.us>
 Dan Horák <dan@danny.cz>
 Dan Koschier <dankosc>
+Dan Oak <danylo.dubinin@gmail.com>
 Dan-Gry <danielgryning@gmail.com>
 Daniel <bestdani>
 Daniel Bailey <danieljabailey>
 Daniel Dunbar <daniel@zuster.org>
 Daniel Genrich <daniel.genrich@gmx.net>
 Daniel Grosse <Spikebaby>
+Daniel Hill <daniel@gluo.nz>
 Daniel Salazar <zanqdo@gmail.com>
 Daniel Stokes <kupomail@gmail.com>
 Danrae Pray <blink.ornitier@gmail.com>
 Dave Pagurek <davepagurek>
 David Ballesteros <dballesg>
 David Friedli <hlorus>
+David Min <s.davidmin@gmail.com>
 David Murmann <david@23x5.net>
+David N <glassbeaver@noreply.localhost>
 David Vogel <Dadido3>
 David-Sebald <SebaldDM13@gmail.com>
 Dawid Kurek <dkurek@motionvfx.com>
@@ -261,8 +276,11 @@ Ervin Weber <ervin.weber@gmail.com>
 Erwin Coumans <blender@erwincoumans.com>
 Ethan Hall <Ethan1080>
 Ethan Mulwee <emulwee15@gmail.com>
+Ethan Porcaro <ethan@varrett.com>
 Eugene Kuznetsov <eugene.kuznetsov@amd.com>
 Evan Wilson <EAW>
+EvanLuo42 <evanluo@cs.ucsb.edu>
+Eyad Senosy <esnosy@proton.me>
 Fabian Schempp <fabianschempp@googlemail.com>
 Fabian-Herb <fabian-herb@noreply.localhost>
 Fabricio Luis <ce3po.robo@gmail.com>
@@ -342,6 +360,7 @@ Ivan Kosarev <mail@ivankosarev.com>
 Ivan Perevala <ivpe>
 Iyad Ahmed <iyadahmed430@gmail.com>
 Jack Andersen <someemail@gmail.com>
+Jackson Zheng <business.jackson.zheng@gmail.com>
 Jacob Møller <SirPaws>
 Jacques Beuarain <jacques.beaurain@gmail.com>
 Jacques Guignot <guignot@wanadoo.fr>
@@ -357,7 +376,7 @@ James Fulop <Yam>
 James Monteath <james@blender.org>
 James Partsafas <JamesPartsafas>
 James Yonan <james@openvpn.net>
-Jan-Hendrik-Muller <jan-hendrik-muller@noreply.localhost>
+Jan-Hendrik Müller <jan-hendrik-muller@noreply.localhost>
 Jan-Willem van Dronkelaar <jwvd>
 Janne Karhu <jhkarh@gmail.com>
 Janne Nylander <j.nylander4444@gmail.com>
@@ -373,6 +392,7 @@ Jean First <robbott>
 Jean-Luc Peurière <jlp@nerim.net>
 Jean-Silas <jeansilas@wiselich.com>
 Jeducious <jameshcrowther>
+Jeff Heward <jh00335@gmail.com>
 Jeff Knox <jd.knox@gmail.com>
 Jeff Moguillansky <quic_jmoguill@quicinc.com>
 Jeffrey Hoover <italic.rendezvous@gmail.com>
@@ -405,6 +425,7 @@ Jonathan Plasse <jonathan.plasse@eilbek-research.de>
 Jonathan Smith <j.jaydez@gmail.com>
 Jonathan Williamson <jonathan@cgcookie.com>
 Jordan Henshaw <jordan-henshaw@noreply.localhost>
+Jordan Justen <jljusten@noreply.localhost>
 Jorge Bernal <jbernalmartinez@gmail.com>
 Jorijn de Graaf <bonj@noreply.localhost>
 Jorn Visser <git@jornvisser.com>
@@ -527,6 +548,7 @@ Martin Heistermann <mheistermann@noreply.localhost>
 Martin Poirier <theeth@yahoo.com>
 Martin Vignali <martin.vignali@gmail.com>
 Masakazu Ito <sakasama@mtc.biglobe.ne.jp>
+Matej Kotas <matej.kotas@live.com>
 Mateo de Mayo <mateodemayo@gmail.com>
 Mateusz Albecki <mateusz.albecki@outlook.com>
 Mateusz Grzeliński <grzelinskimat@gmail.com>
@@ -591,6 +613,7 @@ Mukhesh <mvsaimukhesh@gmail.com>
 Myles Walcott <myles_walcott>
 Myron Carey <myroncarey>
 Namit Bhutani <namit.bhut@gmail.com>
+Natalie Cuthbert <natalie@cuthbert.co.za>
 Nate Rupsis <nrupsis@gmail.com>
 Nathan Burnham <nathan@nathanburnham.uk>
 Nathan Craddock <nzcraddock@gmail.com>
@@ -598,6 +621,8 @@ Nathan Letwory <nathan@blender.org>
 Nathan Lovato <nathan@gdquest.com>
 Nathan Rozendaal <super_jo_nathan>
 Nathan Vegdahl <cessen@cessen.com>
+Nazir <nazir.galimov@gmail.com>
+Neale Swinnerton <neale@sw1nn.com>
 Neko-Asakura <neko-asakura@noreply.localhost>
 Nicholas Bishop <nicholasbishop@gmail.com>
 Nicholas Rishel <rishel.nick@gmail.com>
@@ -616,6 +641,7 @@ Nikita Sirgienko <nikita.sirgienko@intel.com>
 Nikolaus Leopold <nikolaus.leopold@gmail.com>
 Nils Thuerey <nils@thuerey.de>
 Nischay-Raj <nischay-raj@noreply.localhost>
+Nithurshen Karthikeyan <nithurshen@gmail.com>
 Norman Lin <nlin@nlin.net>
 NueSB <moocowperson@gmail.com>
 Octave C <toctave>
@@ -632,6 +658,7 @@ Pablo Vazquez <pablo@blender.org>
 Padraig O Cinneide <me@padraig.org>
 Paolo Acampora <pkrime>
 Paolo Amadini <paolo.blender.dev@amadzone.org>
+Pardhav Maradani <pardhav.maradani@gmail.com>
 Pasang Bomjan <developer@irextia.studio>
 Pascal Schoen <pascal.schoen@adidas-group.com>
 Patrick Bender <ichbinkeinreh>
@@ -665,11 +692,13 @@ Philippe Schmid <tuxtoriel@openmailbox.com>
 Phillip Thomas <Cambloid>
 Phoenix Katsch <phoenixkatsch@gmail.com>
 Pi Lanningham <Quantumplation>
+Pierce Brooks <piercebrooks@rocketmail.com>
 Pierluigi Grassi <pierluigi@tukano.it>
 Pierre Risch <prisch>
 Pierrick Bouvier <pierrick.bouvier@linaro.org>
 Piotr Makal <pmakal>
 Piotr Ostrowski <postrowski>
+Pock <pock@noreply.localhost>
 Prakhar Singh Chouhan <tunealso@gmail.com>
 Pratik Borhade <pratikborhade302@gmail.com>
 Prikshit singh <prikshitsingh79@gmail.com>
@@ -688,6 +717,7 @@ Rateeb Riyasat <bmollusc>
 Raul Fernandez <farsthary84@gmail.com>
 Rawalanche <rawalanche@gmail.com>
 Ray Molenkamp <github@lazydodo.com>
+ReaalSATYAM <satyamnaithani14@gmail.com>
 Rebecca Dengate <beckyd>
 Red Mser <RedMser>
 Reinier de Blois <rddeblois@gmail.com>
@@ -751,6 +781,7 @@ Sietse Brouwer <sietse@hetvrijeoog.nl>
 Simon Clitherow <aphex@nildram.co.uk>
 Simon G <intrigus>
 Simon Lenz <Amudtogal>
+Simon Prager <simon.prager@noreply.localhost>
 Simon Repp <simon@openideas.at>
 Simon Thommes <simon@blender.org>
 Simone Barbieri <s.barbieri>
@@ -797,6 +828,7 @@ Tim Stullich <tstullich>
 Timo Gurr <timo.gurr@gmail.com>
 Tobias Heinke <TobiasH>
 Tobias Kozel <t.kozel@pm.me>
+Tobias Kummer | Overmind Studios <tobiaskummer@googlemail.com>
 Toby Yang <tianer2820@outlook.com>
 Tom Edwards <contact@steamreview.org>
 Tom Martin <tom.martin1239@gmail.com>
@@ -810,8 +842,10 @@ TonyG <TonyG>
 Torsten Keßler <t.kessler@posteo.de>
 Torsten Rupp <foobar@blender.org>
 Trantor <trantor@noreply.localhost>
+Treata Norouzi <treata11@yahoo.com>
 Tristan Porteries <republicthunderbolt9@gmail.com>
 Troy Sobotka <troy.sobotka@gmail.com>
+Trung Phạm <0znightlord0@gmail.com>
 Tuan N <tuan.ngn94@gmail.com>
 Tuomo Keskitalo <tuomo.keskitalo@iki.fi>
 Tyler <tsjordan>
@@ -819,6 +853,7 @@ Tyler Alden Gubala <TylerGubala>
 Tyler Seacrest <tylerseacrest>
 Ulysse Martin <you.le@live.fr>
 Urko Mauduit <urko3d@gmail.com>
+Urumbekov Aryslan <unerr@noreply.localhost>
 Vaishnav S <padthai>
 Valdemar Lindberg <Voldie>
 Valentin <Poulpator>
@@ -830,6 +865,7 @@ Victor-Louis De Gusseme <victorlouis>
 Viktoriia Safiullina <safiuvik>
 Ville Kivistö <vkivisto>
 Vincent Blankfield <vvv>
+Viraj Bhartiya <vlbhartiya@gmail.com>
 Vitalijs Komasilovs <vitalijs.komasilovs@gmail.com>
 Vitor Boschi <vitorboschi@gmail.com>
 Vuk Gardašević <lijenstina>
@@ -867,6 +903,7 @@ Yuntoko <yuntokon@gmail.com>
 Yury <3dfigaro@noreply.localhost>
 Z-Map <blendfan@gmail.com>
 ZHU Xinyu <xzhuah77@gmail.com>
+Zaituny <mohamedinv.580@gmail.com>
 Zev Eisenberg <ZevEisenberg>
 Zheng-Ze <zheng-ze@noreply.localhost>
 Zhou Qiankang <wszqkzqk@qq.com>
@@ -880,6 +917,7 @@ bartus <bartus@noreply.localhost>
 bird_d <bird_d>
 brunoT <drehuwann@gmail.com>
 buildxyz-git <buildxyz@gmail.com>
+by_ma <by_ma@noreply.localhost>
 cgtinker <Denys.Hsu@gmail.com>
 clankill3r <clankill3r@gmail.com>
 coyo_t <constachugga@gmail.com>
@@ -888,6 +926,7 @@ dshot92 <dshot92@gmail.com>
 dupoxy <dupoxy@gmail.com>
 feelamee <fosterlounch@gmail.com>
 fiord <hyoga_quasar@yahoo.co.jp>
+golden dragon <trmhtk2@gmail.com>
 grady <mgradysaunders@gmail.com>
 himisa <himisa@noreply.localhost>
 hogan.mastanduno <hogan.mastanduno@bytedance.com>
@@ -897,37 +936,52 @@ jim man <jimman2003>
 jlalleve <julien.lalleve@gmail.com>
 jon denning <gfxcoder@gmail.com>
 kavu <kavukamari@gmail.com>
+kh4f <kh4f.dev@gmail.com>
 kiki <charles@skeletalstudios.com>
 kitt <blender@kittcat.dev>
+kunal <kunal22102005@gmail.com>
 listout <listout@protonmail.com>
 luz paz <luzpaz@proton.me>
 marcopavanello <marco.pavanello@protonmail.com>
+maroulokefalos <maroulokefalos@noreply.localhost>
 matc <matc>
 menda <alguien@aqui.es>
 n-kall <noa@tutamail.com>
 nBurn <nbwashburn@gmail.com>
+neelpatel <neelpatel19012004@gmail.com>
 noodlebox <noodlebox.art@gmail.com>
 notrudyyy <rudy.vempati@gmail.com>
 nutti <nutti.metro@gmail.com>
 ok_what <ip1149a@gmail.com>
+penta <penta@noreply.localhost>
+phantomsoldierking <patilyogeshgouda@gmail.com>
 powergainer <95447782+powergainer@users.noreply.github.com>
 priera <pedro.riera.marto@gmail.com>
 quackarooni <alfonsomartzii@gmail.com>
 rifai.id <arifai.dev@gmail.com>
+rohit-b-v <rohitbv.vips@gmail.com>
 sake <irrevocableSake>
 sandarm <sandarm@noreply.localhost>
+sap <sap@sapples.net>
 seanterelle <seanterelle3d@gmail.com>
 secext2022 <secext2022@outlook.com>
 sentharn <sentharn@noreply.localhost>
+shikhin <shikhindah@gmail.com>
+shokuyansh <anshmalgotra@gmail.com>
 softyoda <yo561@live.fr>
 swann <slumber>
+syzygial <syzygial@noreply.localhost>
 techmadentertainment <tech@madentertainment.it>
 unclezeiv <davide.vercelli@gmail.com>
+unknown <khubofficial00@gmail.com>
+williamzchu@gmail.com <williamzchu@gmail.com>
 yves <valfeur>
 zhanghe9702 <zhanghe9702@163.com>
 Élie Michel <elie>
 Łukasz Kwoska <Szakulus>
+Ștefan Talpalaru <stefantalpalaru@yahoo.com>
 наб <nabijaczleweli@nabijaczleweli.xyz>
+佳雯 程 <chiaki0meow@gmail.com>
 # Please DO NOT APPEND here. See comments at the top of the file.
 # END individuals section.
 
diff --git a/tools/utils/git_data_canonical_authors.py b/tools/utils/git_data_canonical_authors.py
index e6cb7f56a7c..438bb6973bd 100644
--- a/tools/utils/git_data_canonical_authors.py
+++ b/tools/utils/git_data_canonical_authors.py
@@ -75,20 +75,20 @@ def canonical_author_map() -> dict[str, str]:
         "Alexandre-Cardaillac <alexandre.cardaillac@sydney.edu.au>": (
             "Alexandre Cardaillac <cardaillac.alexandre@gmail.com>",
         ),
-        "Aleš Jelovčan <frogstomp>": (
-            "Aleš Jelovčan <frogstomp@noreply.localhost>",
+        "Ale\u0161 Jelov\u010dan <frogstomp>": (
+            "Ale\u0161 Jelov\u010dan <frogstomp@noreply.localhost>",
             "frogstomp <email.frogstomp@gmail.com>",
         ),
         "Almaz Shinbay <almaz.shinbay@nu.edu.kz>": (
             "Almaz-Shinbay <almaz-shinbay@noreply.localhost>",
         ),
-        "Amélie Fondevilla <amelie.fondevilla@les-fees-speciales.coop>": (
+        "Am\u00e9lie Fondevilla <amelie.fondevilla@les-fees-speciales.coop>": (
             "Amelie <amelie.fondevilla@les-fees-speciales.coop>",
             "Amelie Fondevilla <afonde>",
             "Amelie Fondevilla <amelie.fondevilla@les-fees-speciales.coop>",
             "Amelie Fondevilla <amelie@les-fees-speciales.coop>",
             "Amelie Fondevilla <amelief@noreply.localhost>",
-            "Amélie Fondevilla <afonde>",
+            "Am\u00e9lie Fondevilla <afonde>",
         ),
         "Andrew Oates <andrew@andrewoates.com>": (
             "Andrew Oates <andrewoates@noreply.localhost>",
@@ -101,6 +101,9 @@ def canonical_author_map() -> dict[str, str]:
         "Andy Beers <acbeers1@gmail.com>": (
             "Andy Beers <andybeers@noreply.localhost>",
         ),
+        "Angus Stanton <angusstanton225@gmail.com>": (
+            "Angus Stanton <abstanton>",
+        ),
         "Ankit Meel <ankitjmeel@gmail.com>": (
             "Ankit <ankitm>",
             "Ankit Meel <ankitm>",
@@ -112,6 +115,10 @@ def canonical_author_map() -> dict[str, str]:
         "Anthony Roberts <anthony.roberts@linaro.org>": (
             "Anthony <anthony-roberts@noreply.localhost>",
         ),
+        "Anton Stuk <sigman@ioupg.com>": (
+            "Anton Stuk <sigman@noreply.localhost>",
+            "SiGMan <sigman@ioupg.com>",
+        ),
         "Antonio Vazquez <blendergit@gmail.com>": (
             "Antonio  Vazquez <blendergit@gmail.com>",
             "Antonio Vazquez <antoniov>",
@@ -125,12 +132,15 @@ def canonical_author_map() -> dict[str, str]:
             "Aras Pranckevicius <aras_p>",
             "Aras Pranckevicius <aras_p@noreply.localhost>",
         ),
+        "Aryan Verma <aryan.verma@adypu.edu.in>": (
+            "Aryan Verma <aryan-verma-4@noreply.localhost>",
+        ),
         "Arye Ramaty <aryeramaty@gmail.com>": (
             "Arye Ramaty <BelgaratTheGrey>",
             "Arye Ramaty <aryeramaty@noreply.localhost>",
         ),
         "Attila Afra <attila.t.afra@intel.com>": (
-            "Attila Áfra <aafra@noreply.localhost>",
+            "Attila \u00c1fra <aafra@noreply.localhost>",
         ),
         "Bai Gave <3171394913@qq.com>": (
             "BaiGave <107305554+BaiGave@users.noreply.github.com>",
@@ -155,6 +165,7 @@ def canonical_author_map() -> dict[str, str]:
             "Ben Beilharz <pixelsandpointers@noreply.localhost>",
         ),
         "Bill Spitzak <bills@sidefx.com>": (
+            "Bill Spitzak <spitzak@gmail.com>",
             "Bill-Spitzak <bill-spitzak@noreply.localhost>",
         ),
         "Blastframe <kevin@blastframe.com>": (
@@ -173,7 +184,7 @@ def canonical_author_map() -> dict[str, str]:
             "Brecht Van Lommel <brecht@solidangle.com>",
             "Brecht Van Lommel <brechtvanlommel@gmail.com>",
             "Brecht Van Lommel <brechtvanlommel@pandora.be>",
-            "Brecht Van Lömmel <brechtvanlommel@gmail.com>",
+            "Brecht Van L\u00f6mmel <brechtvanlommel@gmail.com>",
             "Brecht van Lommel <brechtvanlommel@gmail.com>",
             "recht Van Lommel <brecht@blender.org>",
         ),
@@ -189,6 +200,9 @@ def canonical_author_map() -> dict[str, str]:
             "Campbell Barton <campbellbarton>",
             "Campbell Barton <ideasman42@gmail.com>",
         ),
+        "Carlo Andreacchio <carlorules@gmail.com>": (
+            "Carlo Andreacchio <carloandreacchio@noreply.localhost>",
+        ),
         "Cartesian Caramel <cartesiancaramel@gmail.com>": (
             "Cartesian Caramel <bend14141@gmail.com>",
         ),
@@ -196,9 +210,9 @@ def canonical_author_map() -> dict[str, str]:
             "casey bianco-davis <caseycasey739@gmail.com>",
             "casey-bianco-davis <casey-bianco-davis@noreply.localhost>",
         ),
-        "Charles Flèche <charles.fleche@ubisoft.com>": (
-            "Charles Flèche <charlesf>",
-            "Charles Flèche <charlesfleche@noreply.localhost>",
+        "Charles Fl\u00e8che <charles.fleche@ubisoft.com>": (
+            "Charles Fl\u00e8che <charlesf>",
+            "Charles Fl\u00e8che <charlesfleche@noreply.localhost>",
         ),
         "Charles Wardlaw <cwardlaw@nvidia.com>": (
             "Charles Wardlaw (@CharlesWardlaw) <>",
@@ -227,14 +241,14 @@ def canonical_author_map() -> dict[str, str]:
         "Christophe Hery <chery@fb.com>": (
             "Christophe Hery <chery>",
         ),
-        "Clément Foucault <foucault.clem@gmail.com>": (
+        "Cl\u00e9ment Foucault <foucault.clem@gmail.com>": (
             "Clment Foucault <fclem>",
             "Clment Foucault <foucault.clem@gmail.com>",
-            "Clément Foucault <foucault.clem@gmail.com>",
-            "Clément <clement@Clements-MacBook-Pro.local>",
-            "Clément FOUCAULT <foucault.clem@gmail.com>",
-            "Clément Foucault <fclem>",
-            "Clément Foucault <fclem@noreply.localhost>",
+            "Cl\u00c3\u00a9ment Foucault <foucault.clem@gmail.com>",
+            "Cl\u00e9ment <clement@Clements-MacBook-Pro.local>",
+            "Cl\u00e9ment FOUCAULT <foucault.clem@gmail.com>",
+            "Cl\u00e9ment Foucault <fclem>",
+            "Cl\u00e9ment Foucault <fclem@noreply.localhost>",
             "fclem <foucault.clem@gmail.com>",
         ),
         "Colin Basnett <cmbasnett@gmail.com>": (
@@ -247,6 +261,9 @@ def canonical_author_map() -> dict[str, str]:
             "Colin Marmond <kdaf@noreply.localhost>",
             "Colin Marmont <Kdaf>",
         ),
+        "Criss-Ivana <criss.ivana@gmail.com>": (
+            "Criss-Ivana <cristian.m.ivana@gmail.com>",
+        ),
         "Dalai Felinto <dalai@blender.org>": (
             "Dalai Felinto <dfelinto>",
             "Dalai Felinto <dfelinto@gmail.com>",
@@ -320,7 +337,7 @@ def canonical_author_map() -> dict[str, str]:
             "Fabian Schempp <fabian_schempp>",
         ),
         "Fabricio Luis <ce3po.robo@gmail.com>": (
-            "Fabrício Luis <ce3po>",
+            "Fabr\u00edcio Luis <ce3po>",
         ),
         "Falk David <falk@blender.org>": (
             "Falk David <falkdavid@gmx.de>",
@@ -336,7 +353,7 @@ def canonical_author_map() -> dict[str, str]:
             "Fynn Grotehans <68659993+Fynn-G@users.noreply.github.com>",
             "Fynn Grotehans <TheFynn>",
         ),
-        "Félix <Miadim>": (
+        "F\u00e9lix <Miadim>": (
             "Flix <Miadim>",
         ),
         "Gabriel Lee <harpoonlobotomy@gmail.com>": (
@@ -346,6 +363,9 @@ def canonical_author_map() -> dict[str, str]:
             "Gaia Clary <gaiaclary>",
             "gaiaclary <gaia.clary@machinimatrix.org>",
         ),
+        "Geedoubleu <gustavocalderon571@yahoo.com>": (
+            "Geedoubleu <contact.geedoubleu@gmail.com>",
+        ),
         "George Mavroeidis <gmav.graphics@gmail.com>": (
             "George Mavroeidis <gdmavroeidis@hotmail.com>",
         ),
@@ -426,7 +446,7 @@ def canonical_author_map() -> dict[str, str]:
             "illua1 <modormoder@gmail.com>",
             "\u0438\u043b\u044c\u044f _ <modormoder@gmail.com>",
         ),
-        "Inês Almeida <britalmeida@gmail.com>": (
+        "In\u00eas Almeida <britalmeida@gmail.com>": (
             "Ines Almeida <britalmeida@gmail.com>",
             "brita <britalmeida@gmail.com>",
         ),
@@ -444,6 +464,9 @@ def canonical_author_map() -> dict[str, str]:
             "Jacques Lucke <jacqueslucke@noreply.localhost>",
             "Jacques Lucke <mail@jlucke.com>",
         ),
+        "Jan-Hendrik M\u00fcller <jan-hendrik-muller@noreply.localhost>": (
+            "Jan-Hendrik-Muller <jan-hendrik-muller@noreply.localhost>",
+        ),
         "Jason Fielder <jason-fielder@noreply.localhost>": (
             "Jason Fielder <jason_apple>",
         ),
@@ -474,6 +497,7 @@ def canonical_author_map() -> dict[str, str]:
             "Johannes J <johannesj>",
         ),
         "John Kiril Swenson <kirilswenson@gmail.com>": (
+            "John Kiril Swenson <eliphaz@noreply.localhost>",
             "John Swenson <zeltuva@gmail.com>",
         ),
         "Johnny Matthews <johnny.matthews@gmail.com>": (
@@ -485,6 +509,9 @@ def canonical_author_map() -> dict[str, str]:
         "Jonas Holzman <jonas@holzman.fr>": (
             "Jonas Holzman <jonas@blender.org>",
         ),
+        "Jonathan Lampel <jlampel@autotroph.com>": (
+            "jlampel <jlampel@autotroph.com>",
+        ),
         "Jorijn de Graaf <bonj@noreply.localhost>": (
             "Jorijn de Graaf <bonj>",
             "bonj <jorijndegraaf@gmail.com>",
@@ -519,10 +546,10 @@ def canonical_author_map() -> dict[str, str]:
             "Jun Mizutani <jmztn>",
             "Jun Mizutani <jmztn@noreply.localhost>",
         ),
-        "Jörg Müller <nexyon@gmail.com>": (
+        "J\u00f6rg M\u00fcller <nexyon@gmail.com>": (
             "Joerg Mueller <nexyon@gmail.com>",
         ),
-        "Jürgen Herrmann <shadowrom@me.com>": (
+        "J\u00fcrgen Herrmann <shadowrom@me.com>": (
             "Juergen Herrmann <shadowrom@me.com>",
         ),
         "Kamil Galik <kgalik@3dconnexion.com>": (
@@ -539,9 +566,9 @@ def canonical_author_map() -> dict[str, str]:
         "Kevin C. Burke <kevincburke@noreply.localhost>": (
             "Kevin C. Burke <blastframe>",
         ),
-        "Kévin Dietrich <kevin.dietrich@mailoo.org>": (
+        "K\u00e9vin Dietrich <kevin.dietrich@mailoo.org>": (
             "Kevin Dietrich <kevin.dietrich@mailoo.org>",
-            "Kévin Dietrich <kevindietrich>",
+            "K\u00e9vin Dietrich <kevindietrich>",
         ),
         "Laurynas Duburas <laduem@gmail.com>": (
             "Laurynas Duburas <laurynas>",
@@ -574,15 +601,15 @@ def canonical_author_map() -> dict[str, str]:
             "Lukas Stockner <lukas.stockner@freenet.de>",
             "Lukas Stockner <lukasstockner97>",
         ),
-        "Lukas Tönne <lukas@blender.org>": (
+        "Lukas T\u00f6nne <lukas@blender.org>": (
             "Lukas Toenne <lukas.toenne@googlemail.com>",
-            "Lukas Tönne <lukas.toenne@gmail.com>",
-            "Lukas Tönne <lukastonne@noreply.localhost>",
+            "Lukas T\u00f6nne <lukas.toenne@gmail.com>",
+            "Lukas T\u00f6nne <lukastonne@noreply.localhost>",
         ),
         "Luya Tshimbalanga <luya>": (
             "Luya Tshimbalanga <luya-tshimbalanga@noreply.localhost>",
         ),
-        "Léo Depoix <PiloeGAO>": (
+        "L\u00e9o Depoix <PiloeGAO>": (
             "PiloeGAO <leonumerique@gmail.com>",
         ),
         "Mai Lavelle <mai.lavelle@gmail.com>": (
@@ -598,8 +625,11 @@ def canonical_author_map() -> dict[str, str]:
             "Manuel Castilla <manzanilla>",
         ),
         "Marc Chehab <marcchehab@protonmail.ch>": (
-            "Marc Chéhab <marcchehab@noreply.localhost>",
-            "Marc Chéhab <marcluzmedia>",
+            "Marc Ch\u00e9hab <marcchehab@noreply.localhost>",
+            "Marc Ch\u00e9hab <marcluzmedia>",
+        ),
+        "Marc Hamamji <hamamjimarc@gmail.com>": (
+            "MarcHamamji <hamamjimarc@gmail.com>",
         ),
         "Marcos Perez <pistolario>": (
             "Marcos Perez <pistolario@noreply.localhost>",
@@ -622,8 +652,8 @@ def canonical_author_map() -> dict[str, str]:
             "Martin-Vignali <martin-vignali@noreply.localhost>",
             "mvji <33432858+mvji@users.noreply.github.com>",
         ),
-        "Mateusz Grzeliński <grzelinskimat@gmail.com>": (
-            "Mateusz Grzeliński <brezdo>",
+        "Mateusz Grzeli\u0144ski <grzelinskimat@gmail.com>": (
+            "Mateusz Grzeli\u0144ski <brezdo>",
         ),
         "Matias Mendiola <matias.mendiola@gmail.com>": (
             "Matias Mendiola <mendio>",
@@ -643,6 +673,7 @@ def canonical_author_map() -> dict[str, str]:
         "Mattias Fredriksson <mattias-fredriksson91@hotmail.se>": (
             "Mattias Fredriksson <Osares>",
             "MattiasF <mattias-fredriksson91@hotmail.se>",
+            "Osares <mattias-fredriksson91@hotmail.se>",
         ),
         "Max Schlecht <bobbe@noreply.localhost>": (
             "Max Schlecht <Bobbe>",
@@ -713,6 +744,10 @@ def canonical_author_map() -> dict[str, str]:
             "Nikita Sirgienko <sirgienko>",
             "Nikita Sirgienko <sirgienko@noreply.localhost>",
         ),
+        "Nithurshen Karthikeyan <nithurshen@gmail.com>": (
+            "Nithurshen <nithurshen@gmail.com>",
+            "Nithurshen Karthikeyan <nithurshen@noreply.localhost>",
+        ),
         "Olivier Maury <omaury@meta.com>": (
             "Olivier Maury <omaury>",
         ),
@@ -741,10 +776,12 @@ def canonical_author_map() -> dict[str, str]:
             "Paolo Amadini <pamadini@noreply.localhost>",
         ),
         "Pasang Bomjan <developer@irextia.studio>": (
+            "IREXTIA <developer@irextia.com>",
             "IREXTIA <developer@irextia.studio>",
+            "irex124 <developer@irextia.com>",
         ),
         "Pascal Schoen <pascal.schoen@adidas-group.com>": (
-            "Pascal Schön <VanCantus>",
+            "Pascal Sch\u00f6n <VanCantus>",
         ),
         "Patrick Busch <xylvier@noreply.localhost>": (
             "Patrick Busch <Xylvier>",
@@ -775,6 +812,9 @@ def canonical_author_map() -> dict[str, str]:
         "Phoenix Katsch <phoenixkatsch@gmail.com>": (
             "Phoenix Katsch <phoenixkatsch>",
         ),
+        "Pierce Brooks <piercebrooks@rocketmail.com>": (
+            "Pierce Brooks <pierce-brooks@noreply.localhost>",
+        ),
         "Pierre Pontier <pierre.pontier@suryavarman.fr>": (
             "Pierre Pontier <pierre.pontier@laposte.net>",
         ),
@@ -826,6 +866,7 @@ def canonical_author_map() -> dict[str, str]:
             "Sahar A. Kashi  <sahar.alipourkashi@amd.com>",
             "Sahar A. Kashi <salipour@noreply.localhost>",
             "Sahar Kashi <sahar.kashi@amd.com>",
+            "salipour <sahar.kashi@amd.com>",
             "salipourto <sahar.alipourkashi@amd.com>",
         ),
         "Scurest <scurest>": (
@@ -857,6 +898,7 @@ def canonical_author_map() -> dict[str, str]:
             "Sebastian Parborg <zeddb@noreply.localhost>",
         ),
         "Sergey Sharybin <sergey@blender.org>": (
+            "Sergey <sergey@blender.org>",
             "Sergey Sharybin <sergey.vfx@gmail.com>",
             "Sergey Sharybin <sergey>",
             "Sergey Sharybin <sergey@noreply.localhost>",
@@ -867,6 +909,7 @@ def canonical_author_map() -> dict[str, str]:
         ),
         "Shashank Shekhar <secondary.cmdr2@gmail.com>": (
             "Shashank Shekhar <cmdr2>",
+            "cmdr2 <secondary.cmdr2@gmail.com>",
         ),
         "Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in>": (
             "Siddhartha Jejurkar <sidd017>",
@@ -898,10 +941,10 @@ def canonical_author_map() -> dict[str, str]:
             "Sun Kim <persun@noreply.localhost>",
             "persun <perplexing.sun@gmail.com>",
         ),
-        "Sybren A. Stüvel <sybren@blender.org>": (
+        "Sybren A. St\u00fcvel <sybren@blender.org>": (
             "Sybren A. St\xC3\x83\xC2\xBCvel <sybren@stuvel.eu>",
-            "Sybren A. Stüvel <sybren>",
-            "Sybren A. Stüvel <sybren@stuvel.eu>",
+            "Sybren A. St\u00fcvel <sybren>",
+            "Sybren A. St\u00fcvel <sybren@stuvel.eu>",
         ),
         "T0MIS0N <t0mis0n@noreply.localhost>": (
             "T0MIS0N <50230774+T0MIS0N@users.noreply.github.com>",
@@ -923,11 +966,20 @@ def canonical_author_map() -> dict[str, str]:
         "Thomas Szepe <HG1_public@gmx.net>": (
             "HG1 <HG1_public@gmx.net>",
         ),
+        "Tobias Kummer | Overmind Studios <tobiaskummer@googlemail.com>": (
+            "Tobias Kummer | Overmind Studios <tobiaskummer@noreply.localhost>",
+            "tobi <tobiaskummer@googlemail.com>",
+            "tobiaskummer <tobiaskummer@noreply.localhost>",
+        ),
         "Tom Edwards <contact@steamreview.org>": (
             "Tom Edwards <artfunkel>",
         ),
-        "Torsten Keßler <t.kessler@posteo.de>": (
-            "Torsten Keßler <tpkessler@noreply.localhost>",
+        "Torsten Ke\u00dfler <t.kessler@posteo.de>": (
+            "Torsten Ke\u00dfler <tpkessler@noreply.localhost>",
+        ),
+        "Treata Norouzi <treata11@yahoo.com>": (
+            "Treata Norouzi <treata-norouzi@noreply.localhost>",
+            "Treata11 <treata11@yahoo.com>",
         ),
         "Tristan Porteries <republicthunderbolt9@gmail.com>": (
             "Porteries Tristan <republicthunderbolt9@gmail.com>",
@@ -935,6 +987,9 @@ def canonical_author_map() -> dict[str, str]:
         "Troy Sobotka <troy.sobotka@gmail.com>": (
             "Troy Sobotka <sobotka>",
         ),
+        "Trung Ph\u1ea1m <0znightlord0@gmail.com>": (
+            "Trung <0znightlord0@gmail.com>",
+        ),
         "Tuomo Keskitalo <tuomo.keskitalo@iki.fi>": (
             "Tuomo Keskitalo <tkeskita>",
         ),
@@ -955,8 +1010,8 @@ def canonical_author_map() -> dict[str, str]:
             "Vitor Boschi <vitorboschi>",
             "Vitor Boschi da Silva <vitorboschi>"
         ),
-        "Vuk Gardašević <lijenstina>": (
-            "Vuk Garda\xC5¡evi\xC4\x87 <lijenstina>",
+        "Vuk Garda\u0161evi\u0107 <lijenstina>": (
+            "Vuk Garda\xC5\u00a1evi\xC4\x87 <lijenstina>",
         ),
         "Wannes Malfait <wannes.malfait@gmail.com>": (
             "Wannes Malfait <Wannes>",
@@ -1019,6 +1074,9 @@ def canonical_author_map() -> dict[str, str]:
             "dupoxy <dupoxy>",
             "dupoxy <dupoxy@noreply.localhost>",
         ),
+        "golden dragon <trmhtk2@gmail.com>": (
+            "golden-dragon <trmhtk2@gmail.com>",
+        ),
         "howetuft <howetuft@gmail.com>": (
             "howetuft <howetuft>",
         ),
@@ -1039,6 +1097,10 @@ def canonical_author_map() -> dict[str, str]:
         "ok_what <ip1149a@gmail.com>": (
             "ok what <ok_what>",
         ),
+        "\u4f73\u96ef \u7a0b <chiaki0meow@gmail.com>": (
+            "Chiaki_meow <chiaki0meow@gmail.com>",
+            "\u4f73\u96ef \u7a0b <chiaki_meow@sjtu.edu.cn>",
+        ),
     }
 
     # Some validation, ensure ordered, consistent to help with maintenance.