diff --git a/AUTHORS b/AUTHORS
index 73eb2a4a4d5..a8ae21ebc61 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -80,6 +80,7 @@ Andrew Wason <rectalogic@rectalogic.com>
 Andrew Wiggin <ender79bl@gmail.com>
 Andrew Williams <sobakasu>
 Andrii Symkin <pembem22>
+Andy Beers <andybeers@noreply.localhost>
 Angel Bueno <angelbpineda>
 Angus Stanton <abstanton>
 Anish Bharadwaj <bharadwajanish@gmail.com>
@@ -109,6 +110,7 @@ Attila Afra <attila.t.afra@intel.com>
 Aurel Gruber <aurel.gruber@infix.ch>
 Aurel Wildfellner <aurel.w@gmail.com>
 Aurelien Jarno <aurel32>
+Ayoub ibn Muhammad <cl3m3c7@riseup.net>
 Azeem Bande-Ali <azeemba>
 Baardaap <blender@aaltjegron.nl>
 Bart van der Braak <bart@blender.org>
@@ -127,6 +129,7 @@ Benoit Bolsee <benoit.bolsee@online.be>
 Bernhard M. Wiedemann <bwiedemann@suse.de>
 Bill Currie <bill@taniwha.org>
 Bill Spitzak <bills@sidefx.com>
+Blastframe <kevin@blastframe.com>
 Blazer <breakingspell@gmail.com>
 Bogdan Nagirniak <bodyan@gmail.com>
 Brad Clark <RiggingDojo>
@@ -142,7 +145,7 @@ Casey Bianco-Davis <caseycasey739@gmail.com>
 Casey Corn <cmccad@yahoo.com>
 Chad Fraleigh <chadf@triularity.org>
 Chao Li <chaolinyc@gmail.com>
-Charles Flèche <charlesf>
+Charles Flèche <charles.fleche@ubisoft.com>
 Charles Wardlaw <cwardlaw@nvidia.com>
 Charlie Carley <snailrose@gmail.com>
 Charlie Jolly <mistajolly@gmail.com>
@@ -183,6 +186,7 @@ Damien Plisson <damien.plisson@yahoo.fr>
 Dan Eicher <dan@eu.phorio.us>
 Dan Horák <dan@danny.cz>
 Dan Koschier <dankosc>
+Dan-Gry <danielgryning@gmail.com>
 Daniel <bestdani>
 Daniel Bailey <danieljabailey>
 Daniel Dunbar <daniel@zuster.org>
@@ -243,7 +247,7 @@ Eugene Kuznetsov <eugene.kuznetsov@amd.com>
 Evan Wilson <EAW>
 Fabian Schempp <fabianschempp@googlemail.com>
 Fabian-Herb <fabian-herb@noreply.localhost>
-Fabrício Luis <ce3po>
+Fabricio Luis <ce3po.robo@gmail.com>
 Falk David <falk@blender.org>
 Fen <chemicalcrux>
 Fermin <ferminlozanorodriguez@gmail.com>
@@ -268,15 +272,18 @@ Geoffroy Krantz <kgeogeo@hotmail.com>
 George Mavroeidis <gmav.graphics@gmail.com>
 George Vogiatzis <Gvgeo>
 Georgiy Markelov <georgiy.m.markelov@gmail.com>
+Gerard Taulats <gerardtaulats@gmail.com>
 Germano Cavalcante <germano.costa@ig.com.br>
 Gilberto Rodrigues <gilbertorodrigues@outlook.com>
 Glenn Tester <karmacop>
 Gottfried Hofmann <gottfried>
+Gracjan Jeżewski <gracjan@motionvfx.com>
 Greg Neumiller <rlneumiller>
 Grigory Revzin <revzingg@gmail.com>
+Guillem Baldi <guillembaldi@gmail.com>
 Guillermo S. Romero <gsr.b3d@infernal-iceberg.com>
 Guillermo Venegas <guillermovcra@gmail.com>
-Habib Gahbiche <habibgahbiche@gmail.com>
+Habib Gahbiche <habib@blender.org>
 Hallam Roberts <MysteryPancake>
 Hamdi Ozbayburtlu <hamdio>
 Hamed Zaghaghi <hamed.zaghaghi@gmail.com>
@@ -315,6 +322,7 @@ Jacques Guignot <guignot@wanadoo.fr>
 Jacques Lucke <jacques@blender.org>
 Jagannadhan Ravi <easythrees>
 Jaggz H <jaggz>
+Jaime Torres <jatber.mrowr@gmail.com>
 Jakub Marcowski <chubercikbattle@gmail.com>
 Jakub Steiner <jimmac@gmail.com>
 Jamell Moore <JamellMoore>
@@ -325,8 +333,10 @@ James Partsafas <JamesPartsafas>
 James Yonan <james@openvpn.net>
 Jan-Willem van Dronkelaar <jwvd>
 Janne Karhu <jhkarh@gmail.com>
+Janne Nylander <j.nylander4444@gmail.com>
 Janusch Patas <patjan>
 Jarrett Johnson <jarrett.johnson>
+Jason C. Wenger <jcwenger@gmail.com>
 Jason Hays <jason_hays22@mymail.eku.edu>
 Jason Schleifer <jasonschleifer>
 Jason Wilkins <Jason.A.Wilkins@gmail.com>
@@ -335,6 +345,7 @@ Jean First <robbott>
 Jean-Luc Peurière <jlp@nerim.net>
 Jeducious <jameshcrowther>
 Jeff Knox <jd.knox@gmail.com>
+Jeff Moguillansky <quic_jmoguill@quicinc.com>
 Jeffrey Hoover <italic.rendezvous@gmail.com>
 Jens <JRottm>
 Jens Ehrhardt <Jens_Eopus>
@@ -342,6 +353,7 @@ Jens Ole Wund <bjornmose@gmx.net>
 Jens Verwiebe <info@jensverwiebe.de>
 Jeroen Bakker <jeroen@blender.org>
 Jesse Yurkovich <jesse.y@gmail.com>
+Jiarui-Yan <jiarui-yan@noreply.localhost>
 Jim Eckerlein <UX3D-eckerlein>
 Jiri Hnidek <jiri.hnidek@tul.cz>
 Jishan Singh <ringmaker>
@@ -358,6 +370,7 @@ Johnny Matthews <johnny.matthews@gmail.com>
 Joilnen Leite <joilnen.leite@gmail.com>
 Jonas Holzman <jonas@holzman.fr>
 JonasDichelle <jonasdichelle@gmail.com>
+Jonathan Plasse <jonathan.plasse@eilbek-research.de>
 Jonathan Smith <j.jaydez@gmail.com>
 Jonathan Williamson <jonathan@cgcookie.com>
 Jorge Bernal <jbernalmartinez@gmail.com>
@@ -463,6 +476,7 @@ Marc Freixas <mfreixas@lsi.upc.edu>
 Marcelo Demian Gómez <mdemiang>
 Marcelo Mutzbauer <1xundoredo@gmail.com>
 Marco <nacioss>
+Marco Rotili <marco.livio.rotili@gmail.com>
 Marcos Perez <pistolario>
 Marino Toscano <marino.toscano@gmail.com>
 Mark Ayers <markthema3@gmail.com>
@@ -500,6 +514,7 @@ Maxim Vasiliev <qmax>
 Maxime Casas <maxime_casas@orange.fr>
 Maxime Chambonnet <Maxzor_2_what_the_fuck_blenderid>
 Maxime Curioni <maxime.curioni@gmail.com>
+Maxime-Cots <maxime-cots@noreply.localhost>
 Melissa <Melissa-Goon>
 Michael <michael64>
 Michael Fox <mfoxdogg@gmail.com>
@@ -535,14 +550,18 @@ Nathan Letwory <nathan@blender.org>
 Nathan Lovato <nathan@gdquest.com>
 Nathan Rozendaal <super_jo_nathan>
 Nathan Vegdahl <cessen@cessen.com>
+Neko-Asakura <neko-asakura@noreply.localhost>
 Nicholas Bishop <nicholasbishop@gmail.com>
 Nicholas Rishel <rishel.nick@gmail.com>
 Nick Milios <semaphore>
 Nick Samarin <nicks1987@bigmir.net>
+Nicola <nicdessi@gmail.com>
 Nicola De Mitri <nicolasap>
 Nicolas Fauvet <droune2001>
+Nig3l <nig3lpro@gmail.com>
 Nika Kutsniashvili <nickberckley@gmail.com>
 Nikhil Shringarpurey <Nikhil.Net>
+Nikita Lisitsa <lisyarus@gmail.com>
 Nikita Sirgienko <nikita.sirgienko@intel.com>
 Nikolaus Leopold <nikolaus.leopold@gmail.com>
 Nils Thuerey <nils@thuerey.de>
@@ -550,6 +569,7 @@ Nischay-Raj <nischay-raj@noreply.localhost>
 Norman Lin <nlin@nlin.net>
 NueSB <moocowperson@gmail.com>
 Octave C <toctave>
+Odréanne Breton <odreanne.breton@ubisoft.com>
 Olivier Jolly <zeograd>
 Olivier Maury <omaury>
 Omar Emara <mail@OmarEmara.dev>
@@ -557,6 +577,7 @@ Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
 Pablo Delgado Krämer <private@pablode.com>
 Pablo Dobarro <pablodp606@gmail.com>
 Pablo Vazquez <pablo@blender.org>
+Padraig-O-Cinneide <me@padraig.org>
 Paolo Acampora <pkrime>
 Paolo Amadini <paolo.blender.dev@amadzone.org>
 Pascal Schoen <pascal.schoen@adidas-group.com>
@@ -605,6 +626,7 @@ Rajesh Advani <rajeshja>
 Rajesh Malviya <rajveer0malviya@gmail.com>
 Ralf Hölzemer <r.hoelzemer@googlemail.com>
 Ramil Roosileht <Limarest>
+Raphael Langerhorst <raphael@gracetech.at>
 Rateeb Riyasat <bmollusc>
 Raul Fernandez <farsthary84@gmail.com>
 Rawalanche <rawalanche@gmail.com>
@@ -618,6 +640,7 @@ Richard Antalik <richardantalik@gmail.com>
 Rick Astley <mrbimax>
 Ricki Myers <antihc3@gmail.com>
 Rob Haarsma <phaseIV@zonnet.nl>
+Rob-Blair <Rob.Blair@Verizon.net>
 Robert Fornof <amdbcg>
 Robert Guetzkow <gitcommit@outlook.de>
 Robert Holcomb <bob_holcomb@hotmail.com>
@@ -652,6 +675,7 @@ Sebastian Parborg <sebastian@blender.org>
 SebastianWitt <w.basti@gmx.de>
 Sebastiano Barrera <bars>
 Sebastián Barschkis <sebbas@sebbas.org>
+SensArice <sensmd@qq.com>
 Sergej Reich <sergej.reich@googlemail.com>
 Sergey Sharybin <sergey@blender.org>
 Shane Ambler <Shane@ShaneWare.Biz>
@@ -679,16 +703,19 @@ Stefan Gartner <stefang@aon.at>
 Stefan Heinz <stefanh@noreply.localhost>
 Stefan Werner <stefan.werner@intel.com>
 Stefano Bonicatti <smjert>
+Steffen Dünner <steffen.duenner@gmail.com>
 Stephan Seitz <theHamsta>
 Stephen Kelly <steveire@gmail.com>
 Stephen Seo <seodisparate>
 Stephen Swaney <sswaney@centurytel.net>
+Sttevan Carnali Joga <sttevan.carnali-joga@ubisoft.com>
 Stuart Broadfoot <gbroadfoot@hotmail.com>
 Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com>
 Sun Kim <perplexing.sun@gmail.com>
 Sv. Lockal <lockalsash@gmail.com>
 Sybren A. Stüvel <sybren@blender.org>
 Szymon Ulatowski <szulat>
+T0MIS0N <t0mis0n@noreply.localhost>
 Takahiro Shizuki <sntulix>
 Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
 Tarek Yasser <tarekspeed7@gmail.com>
@@ -704,6 +731,7 @@ Tianwei Shen <shentianweipku@gmail.com>
 Tim Stullich <tstullich>
 Timo Gurr <timo.gurr@gmail.com>
 Tobias Heinke <TobiasH>
+Tobias Kozel <t.kozel@pm.me>
 Tom Edwards <contact@steamreview.org>
 Tom Musgrove <LetterRip@gmail.com>
 Tomek Gubala <VGT>
@@ -721,7 +749,7 @@ Tyler <tsjordan>
 Tyler Alden Gubala <TylerGubala>
 Tyler Seacrest <tylerseacrest>
 Ulysse Martin <you.le@live.fr>
-Urko <urko3d>
+Urko Mauduit <urko3d@gmail.com>
 Vaishnav S <padthai>
 Valdemar Lindberg <Voldie>
 Valentin <Poulpator>
@@ -755,6 +783,7 @@ Xavier Hallade <xavier.hallade@intel.com>
 Xavier Thomas <xavier.thomas.1980@gmail.com>
 Xiao Xiangquan <xiaoxiangquan@gmail.com>
 Xing Liu <xing>
+Yahia <yahiaouiyahia40@gmail.com>
 Yann Doersam <YetAnotherNiceName>
 Yann Lanthony <yann-lty>
 Yann Vernier <yann@algonet.se>
@@ -765,6 +794,7 @@ Yuki Hashimoto <hzuika>
 Yuki Shirakawa <shirakawa>
 Yuntoko <yuntokon@gmail.com>
 Z-Map <blendfan@gmail.com>
+ZHU Xinyu <xzhuah77@gmail.com>
 Zev Eisenberg <ZevEisenberg>
 Zijun Zhou <eary@noreply.localhost>
 Zopolis4 <creatorsmithmdt@gmail.com>
@@ -776,18 +806,23 @@ bartus <bartus@noreply.localhost>
 bird_d <bird_d>
 brunoT <drehuwann@gmail.com>
 buildxyz-git <buildxyz@gmail.com>
+carnaval <carnaval@12-10e.me>
 cgtinker <Denys.Hsu@gmail.com>
 coyo_t <constachugga@gmail.com>
 dereck <v8786339@hotmail.com>
 dupoxy <dupoxy@gmail.com>
+ernst-ellert <ramonklauck3@gmail.com>
+feelamee <fosterlounch@gmail.com>
 fiord <hyoga_quasar@yahoo.co.jp>
 grady <mgradysaunders@gmail.com>
 himisa <himisa@noreply.localhost>
 il4n <il4n@noreply.localhost>
 jamesf <jameslynnfulop@gmail.com>
 jim man <jimman2003>
+jlalleve <julien.lalleve@gmail.com>
 jon denning <gfxcoder@gmail.com>
 kiki <charles@skeletalstudios.com>
+kitt <blender@kittcat.dev>
 laurynas <laduem@gmail.com>
 listout <listout@protonmail.com>
 luzpaz <luzpaz>
@@ -805,6 +840,8 @@ priera <pedro.riera.marto@gmail.com>
 quackarooni <alfonsomartzii@gmail.com>
 rifai.id <arifai.dev@gmail.com>
 sandarm <sandarm@noreply.localhost>
+seanterelle <seanterelle3d@gmail.com>
+secext2022 <secext2022@outlook.com>
 softyoda <yo561@live.fr>
 swann <slumber>
 unclezeiv <davide.vercelli@gmail.com>
diff --git a/tools/utils/git_data_canonical_authors.py b/tools/utils/git_data_canonical_authors.py
index 6c04094e8dd..e717fc9f0a0 100644
--- a/tools/utils/git_data_canonical_authors.py
+++ b/tools/utils/git_data_canonical_authors.py
@@ -78,6 +78,7 @@ def canonical_author_map() -> dict[str, str]:
         "Ankit Meel <ankitjmeel@gmail.com>": (
             "Ankit <ankitm>",
             "Ankit Meel <ankitm>",
+            "Ankit Meel <ankitm@noreply.localhost>",
         ),
         "Anthony Edlin <akrashe@gmail.com>": (
             "Anthony Edlin <krash>",
@@ -145,6 +146,10 @@ def canonical_author_map() -> dict[str, str]:
         "Casey Bianco-Davis <caseycasey739@gmail.com>": (
             "casey bianco-davis <caseycasey739@gmail.com>",
         ),
+        "Charles Flèche <charles.fleche@ubisoft.com>": (
+            "Charles Flèche <charlesf>",
+            "Charles Flèche <charlesfleche@noreply.localhost>",
+        ),
         "Charles Wardlaw <cwardlaw@nvidia.com>": (
             "Charles Wardlaw (@CharlesWardlaw) <>",
             "Charles Wardlaw <charleswardlaw@noreply.localhost>",
@@ -197,6 +202,9 @@ def canonical_author_map() -> dict[str, str]:
             "Damien Picard <pioverfour>",
             "Damien Picard <pioverfour@noreply.localhost>",
         ),
+        "Dan-Gry <danielgryning@gmail.com>": (
+            "Dangry98 <danielgryning@gmail.com>",
+        ),
         "Daniel Salazar <zanqdo@gmail.com>": (
             "Daniel Salazar <zanqdo>",
             "Daniel Salazar <zanqdo@noreply.localhost>",
@@ -251,6 +259,9 @@ def canonical_author_map() -> dict[str, str]:
         "Fabian Schempp <fabianschempp@googlemail.com>": (
             "Fabian Schempp <fabian_schempp>",
         ),
+        "Fabricio Luis <ce3po.robo@gmail.com>": (
+            "Fabrício Luis <ce3po>",
+        ),
         "Falk David <falk@blender.org>": (
             "Falk David <falkdavid@gmx.de>",
             "Falk David <filedescriptor>",
@@ -278,6 +289,9 @@ def canonical_author_map() -> dict[str, str]:
         "Georgiy Markelov <georgiy.m.markelov@gmail.com>": (
             "georgiy.m.markelov@gmail.com <georgiy.m.markelov@gmail.com>",
         ),
+        "Gerard Taulats <gerardtaulats@gmail.com>": (
+            "Gerard Taulats <tabra@noreply.localhost>",
+        ),
         "Germano Cavalcante <germano.costa@ig.com.br>": (
             "Germano <germano.costa@ig.com.br>",
             "Germano Cavalcante <grmncv@gmail.com>",
@@ -289,6 +303,7 @@ def canonical_author_map() -> dict[str, str]:
         ),
         "Gilberto Rodrigues <gilbertorodrigues@outlook.com>": (
             "Gilberto Rodrigues <gilberto_rodrigues>",
+            "Gilberto.R <gilbertorodrigues@outlook.com>",
         ),
         "Guillermo S. Romero <gsr.b3d@infernal-iceberg.com>": (
             "gsr b3d <gsr.b3d@infernal-iceberg.com>",
@@ -297,7 +312,8 @@ def canonical_author_map() -> dict[str, str]:
             "Guillermo <guillermovcra@gmail.com>",
             "guishe <guillermovcra@gmail.com>",
         ),
-        "Habib Gahbiche <habibgahbiche@gmail.com>": (
+        "Habib Gahbiche <habib@blender.org>": (
+            "Habib Gahbiche <habibgahbiche@gmail.com>",
             "Habib Gahbiche <zazizizou>",
             "Habib Gahbiche <zazizizou@noreply.localhost>",
         ),
@@ -339,6 +355,7 @@ def canonical_author_map() -> dict[str, str]:
             "Iliya Katushenock <modormoder@gmail.com>",
             "MOD <Moder>",
             "illua1 <modormoder@gmail.com>",
+            "\u0438\u043b\u044c\u044f _ <modormoder@gmail.com>",
         ),
         "Inês Almeida <britalmeida@gmail.com>": (
             "Ines Almeida <britalmeida@gmail.com>",
@@ -373,6 +390,7 @@ def canonical_author_map() -> dict[str, str]:
             "Jeroen Bakker <88891617+jeroen-blender@users.noreply.github.com>",
             "Jeroen Bakker <j.bakker@atmind.nl>",
             "Jeroen Bakker <jbakker>",
+            "jeroen@blender.org <Jeroen Bakker>",
             "jeroen@blender.org <jeroen@blender.org>",
         ),
         "Jesse Yurkovich <jesse.y@gmail.com>": (
@@ -428,6 +446,9 @@ def canonical_author_map() -> dict[str, str]:
         "Jürgen Herrmann <shadowrom@me.com>": (
             "Juergen Herrmann <shadowrom@me.com>",
         ),
+        "Kamil Galik <kgalik@3dconnexion.com>": (
+            "kgalik <kgalik@3dconnexion.com>",
+        ),
         "Kaspian Jakobsson <kaspian.jakobsson@gmail.com>": (
             "\x96kaspian.jakobssongmail.com <kaspian.jakobsson@gmail.com>",
         ),
@@ -573,6 +594,9 @@ def canonical_author_map() -> dict[str, str]:
         "Nick Milios <semaphore>": (
             "milios <n_mhlios@hotmail.com>",
         ),
+        "Nikhil Shringarpurey <Nikhil.Net>": (
+            "Nikhil Shringarpurey <nikhil.net@noreply.localhost>",
+        ),
         "Nikita Sirgienko <nikita.sirgienko@intel.com>": (
             "Nikita Sirgienko <sirgienko>",
         ),
@@ -645,6 +669,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>",
             "salipourto <sahar.alipourkashi@amd.com>",
         ),
         "Scurest <scurest>": (
@@ -718,6 +743,9 @@ def canonical_author_map() -> dict[str, str]:
             "Sybren A. Stüvel <sybren>",
             "Sybren A. Stüvel <sybren@stuvel.eu>",
         ),
+        "T0MIS0N <t0mis0n@noreply.localhost>": (
+            "T0MIS0N <50230774+T0MIS0N@users.noreply.github.com>",
+        ),
         "Thomas Dinges <thomas@blender.org>": (
             "Thomas Dinges <blender@dingto.org>",
             "Thomas Dinges <dingto>",
@@ -744,6 +772,9 @@ def canonical_author_map() -> dict[str, str]:
         "Ulysse Martin <you.le@live.fr>": (
             "Ulysse Martin <youle>",
         ),
+        "Urko Mauduit <urko3d@gmail.com>": (
+            "Urko <urko3d>",
+        ),
         "Vasyl Pidhirskyi <vpidhirskyi@gmail.com>": (
             "Vasyl-Pidhirskyi <vpidhirskyi@gmail.com>",
         ),
@@ -787,6 +818,7 @@ def canonical_author_map() -> dict[str, str]:
             "ianwill <wpgermano@gmail.com>",
         ),
         "Xavier Hallade <xavier.hallade@intel.com>": (
+            "Xavier Hallade <me@ph0b.com>",
             "Xavier Hallade <xavierh@noreply.localhost>",
         ),
         "Yann Lanthony <yann-lty>": (