diff --git a/.mailmap b/.mailmap
index aa2e0911ec..1669494cb5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,29 +1,69 @@
+Alexander Holland <alexander.holland@live.de>
+Alexander Holland <alexander.holland@live.de> <alexander.holland@haw-hamburg.de>
+Alexander Holland <alexander.holland@live.de> <AlexHolly>
 Andrea Catania <info@andreacatania.com>
 Andreas Haas <liu.gam3@gmail.com>
-Andreas Haas <Hinsbart@users.noreply.github.com>
-Andreas Haas <entenflugstuhl@gmail.com>
+Andreas Haas <liu.gam3@gmail.com> <hinsbart@gmail.com>
+Andreas Haas <liu.gam3@gmail.com> <hinsbart@users.noreply.github.com>
+Andreas Haas <liu.gam3@gmail.com> <entenflugstuhl@gmail.com>
 Ariel Manzur <ariel@godotengine.org>
-Ariel Manzur <ariel@okamstudio.com>
+Ariel Manzur <ariel@godotengine.org> <punto@godotengine.org>
+Ariel Manzur <ariel@godotengine.org> <ariel@okamstudio.com>
+Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini.local>
+Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini-2.local>
 Bastiaan Olij <mux213@gmail.com>
-Bernhard Liebl <poke1024@gmx.de>
-Bernhard Liebl <poke1024@gmx.org>
+Bernhard Liebl <Bernhard.Liebl@gmx.org> <poke1024@gmx.de>
+Bernhard Liebl <Bernhard.Liebl@gmx.org> <poke1024@gmx.org>
+Chris Bradfield <chris@kidscancode.org> <cb@scribe.net>
+Clay John <claynjohn@gmail.com>
+Clay John <claynjohn@gmail.com> <clayjohn@shaw.ca>
+Dana Olson <dana@shineuponthee.com> <adolson@gmail.com>
+Daniel J. Ramirez <djrmuv@gmail.com>
+Ferenc Arn <tagcup@yahoo.com>
+Ferenc Arn <tagcup@yahoo.com> <tagcup@users.noreply.github.com>
 Geequlim <geequlim@gmail.com>
-Hugo Locurcio <hugo.locurcio@hugo.pro>
+Gilles Roudiere <gilles.roudiere@gmail.com>
+Gilles Roudiere <gilles.roudiere@gmail.com> <gilles.roudiere@laas.fr>
+Guilherme Felipe <guilhermefelipecgs@gmail.com>
 Hugo Locurcio <hugo.locurcio@hugo.pro> <hugo.l@openmailbox.org>
 Hugo Locurcio <hugo.locurcio@hugo.pro> <Calinou@users.noreply.github.com>
+Hugo Locurcio <hugo.locurcio@hugo.pro> Calinou <calinou@opmbx.org>
+Ian Bishop <ianb96@gmail.com>
 Ignacio Etcheverry <ignalfonsore@gmail.com>
+Ignacio Etcheverry <ignalfonsore@gmail.com> <neikeq@users.noreply.github.com>
 Indah Sylvia <ISylvox@yahoo.com>
+J08nY <johny@neuromancer.sk> <jancar.jj@gmail.com>
+J08nY <johny@neuromancer.sk> <J08nY@users.noreply.github.com>
 Jakub Grzesik <kubecz3k@gmail.com>
+Jérôme Gully <jerome.gully0@gmail.com>
 Juan Linietsky <reduzio@gmail.com>
-Juan Linietsky <juan@okamstudio.com>
-Juan Linietsky <reduz@Juans-MBP.fibertel.com.ar>
+Juan Linietsky <reduzio@gmail.com> <juan@godotengine.org>
+Juan Linietsky <reduzio@gmail.com> <juan@okamstudio.com>
+Juan Linietsky <reduzio@gmail.com> <reduz@Juans-MBP.fibertel.com.ar>
+Juan Linietsky <reduzio@gmail.com> <red@kyoko>
 Julian Murgia <the.straton@gmail.com>
-Leon Krause <eska@eska.me>
-Leon Krause <eska@eska.me> <eska014@users.noreply.github.com>
+Kelly Thomas <kelly.thomas@hotmail.com.au>
+Leon Krause <lk@leonkrause.com> <eska@eska.me>
+Leon Krause <lk@leonkrause.com> <eska014@users.noreply.github.com>
 Marcelo Fernandez <marcelofg55@gmail.com>
+Marcin Zawiejski <dragmz@gmail.com>
 Mariano Javier Suligoy <marianognu.easyrpg@gmail.com>
+Mario Schlack <m4r10.5ch14ck@gmail.com>
+Max Hilbrunner <m.hilbrunner@gmail.com>
+Max Hilbrunner <m.hilbrunner@gmail.com> <mhilbrunner@users.noreply.github.com>
+Nathan Warden <nathan@nathanwarden.com> <nathanwardenlee@icloud.com>
+Nuno Donato <nunodonato@gmail.com> <n.donato@estrelasustentavel.pt>
+Pedro J. Estébanez <pedrojrulez@gmail.com> <RandomShaper@users.noreply.github.com>
 Paul Batty <p_batty@hotmail.co.uk>
+Paul Batty <p_batty@hotmail.co.uk> <Paulb23@users.noreply.github.com>
+Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
+Pieter-Jan Briers <pieterjan.briers+git@gmail.com> <pieterjan.briers@gmail.com>
 Poommetee Ketson <poommetee@protonmail.com>
+Rémi Verschelde <rverschelde@gmail.com> <remi@verschelde.fr>
+Ruslan Mustakov <r.mustakov@gmail.com> <ruslan.mustakov@xored.com>
 Saracen <SaracenOne@gmail.com>
+Theo Hallenius <redsymbzone@hotmail.com>
 Thomas Herzog <therzog@mail.de>
+Thomas Herzog <therzog@mail.de> <thomas.herzog@mail.com>
+Thomas Herzog <therzog@mail.de> <thomas.herzog@simedis.com>
 Zher Huei Lee <lee.zh.92@gmail.com>
diff --git a/AUTHORS.md b/AUTHORS.md
index 7859a3cd37..5cb16d532c 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -25,16 +25,16 @@ name is available.
 
 ## Developers
 
-(in alphabetical order, with 10 commits or more excluding merges)
+(in alphabetical order, with over 10 commits excluding merges)
 
     Aaron Franke (aaronfranke)
     Alexander Holland (AlexHolly)
-    Alexey Velikiy (jonyrock)
     Alket Rexhepi (alketii)
     Andrea Catania (AndreaCatania)
     Andreas Haas (Hinsbart)
     Andrii Doroshenko (Xrayez)
     Andy Moss (MillionOstrich)
+    Anish Bhobe (KidRigger)
     Anton Yabchinskiy (a12n)
     Aren Villanueva (kurikaesu)
     Ariel Manzur (punto-)
@@ -46,6 +46,7 @@ name is available.
     Bojidar Marinov (bojidar-bg)
     bruvzg
     Carl Olsson (not-surt)
+    Carter Anderson (cart)
     Chris Bradfield (cbscribe)
     Clay John (clayjohn)
     Dana Olson (adolson)
@@ -61,13 +62,13 @@ name is available.
     Ferenc Arn (tagcup)
     Franklin Sobrinho (TheHX)
     Geequlim
-    Gen (dbsGen)
     George Marques (vnen)
     Gerrit Großkopf (Grosskopf)
     Gilles Roudiere (groud)
     Guilherme Felipe de C. G. da Silva (guilhermefelipecgs)
     Hein-Pieter van Braam (hpvb)
     Hiroshi Ogawa (hi-ogawa)
+    homer666
     Hubert Jarosz (Marqin)
     Hugo Locurcio (Calinou)
     Ian Bishop (ianb96)
@@ -76,7 +77,7 @@ name is available.
     Indah Sylvia (ISylvox)
     J08nY
     Jakub Grzesik (kubecz3k)
-    Jérôme GULLY (Nutriz)
+    Jérôme Gully (Nutriz)
     Joan Fons Sanchez (JFonS)
     Johan Manuel (29jm)
     Joshua Grams (JoshuaGrams)
@@ -95,6 +96,7 @@ name is available.
     Mario Schlack (hurikhan)
     Martin Capitanio (capnm)
     Martin Sjursen (binbitten)
+    Marxin Liška (marxin)
     marynate
     Masoud BH (masoudbh3)
     Matthias Hölzl (hoelzl)
@@ -124,6 +126,7 @@ name is available.
     Saniko (sanikoyes)
     SaracenOne
     sersoong
+    Simon Wenner (swenner)
     Theo Hallenius (TheoXD)
     Thomas Herzog (karroffel)
     Timo (toger5)
diff --git a/DONORS.md b/DONORS.md
index c5689a8b22..05d7f3b7c1 100644
--- a/DONORS.md
+++ b/DONORS.md
@@ -18,10 +18,12 @@ generous deed immortalized in the next stable release of Godot Engine.
 
     Gamblify <https://www.gamblify.com>
     Image Campus <https://www.imagecampus.edu.ar>
+    Yakaz.com <https://yakaz.com>
 
 ## Mini sponsors
 
     Alan Beauchamp
+    Anandarup Mallik
     Andrew Dunai
     Arda Erol
     Brandon Lamb
@@ -36,7 +38,6 @@ generous deed immortalized in the next stable release of Godot Engine.
     Jay Sistar
     Justin Arnold
     Kyle Szklenski
-    Leona Eden
     Leonard Meagher
     Ludosity AB
     Matthieu Huvé
@@ -45,7 +46,6 @@ generous deed immortalized in the next stable release of Godot Engine.
     Nathan Warden
     Neal Gompa (Conan Kudo)
     Patrick Aarstad
-    Pers
     "Rainway "
     Ruslan Mustakov
     Slobodan Milnovic
@@ -54,6 +54,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     Stoney Meyerhoeffer
     thechris
     VilliHaukka
+    Zashi
 
 ## Gold donors
 
@@ -61,17 +62,15 @@ generous deed immortalized in the next stable release of Godot Engine.
     Brandon Waite
     cheese65536
     David Gehrig
-    Edward E
     Florian Krick
+    Jakub Grzesik
     K9Kraken
     Manuele Finocchiaro
     Nathanael Beisiegel
     Officine Pixel S.n.c.
     Retro Village
-    Zashi
     Zaven Muradyan
 
-    13MHz
     Allen Schade
     Andreas Schüle
     Asher Glick
@@ -79,6 +78,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     Daniel James
     Daniel Lynn
     David Giardi
+    Edward E
     Florian Breisch
     Gary Oberbrunner
     Gero
@@ -113,10 +113,9 @@ generous deed immortalized in the next stable release of Godot Engine.
     Dean Harmon
     Ivan Trombley
     Joan Fons
-    John
     Krzysztof Jankowski
+    Lord Bloodhound
     Lucas Ferreira Franca
-    Markus Wiesner
     Nathan Lundquist
     Pascal Grüter
     Petr Malac
@@ -128,10 +127,10 @@ generous deed immortalized in the next stable release of Godot Engine.
     Thomas Bjarnelöf
     Wojciech Chojnacki
     Xavier PATRICELLI
-    Zaq Poi
 
     Alessandra Pereyra
     Alexey Dyadchenko
+    Andrew Bowen
     Benjamin W Flint
     Chau Siu Hung
     Chris Goddard
@@ -159,10 +158,12 @@ generous deed immortalized in the next stable release of Godot Engine.
     Jose Malheiro
     Juan T Chen
     Juraj Móza
+    Kasper Jeppesen
     Klavdij Voncina
     Leandro Voltolino
     Lukáš Rendvanský
     Marius Kamm
+    Markus Wiesner
     Martin Eigel
     Marvin
     Matt Eunson
@@ -170,6 +171,8 @@ generous deed immortalized in the next stable release of Godot Engine.
     Nick Nikitin
     Oliver Dick
     oziatek
+    Paul Hocker
+    Paul Von Zimmerman
     Pete Goodwin
     Ranoller
     ray-tracer
@@ -199,16 +202,17 @@ generous deed immortalized in the next stable release of Godot Engine.
     Anthony Bongiovanni
     Arbor Interactive
     Arthur S. Muszynski
-    Artur Barichello
     Aubrey Falconer
     Avencherus
     Bailey
+    Balázs Batári
     Bastian Böhm
     Benedikt
     Ben Vercammen
     Bernd Jänichen
     Blair Allen
     Brandon
+    Brandon Schaffer
     Bryan Stevenson
     Carl Winder
     Carwyn Edwards
@@ -226,7 +230,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     David Cravens
     David May
     Dominik Wetzel
-    DOXA
+    Duobix
     Edward Herbert
     Egon Elbre
     Elmeri '- Duy Kevin Nguyen
@@ -238,13 +242,13 @@ generous deed immortalized in the next stable release of Godot Engine.
     fengjiongmax
     Foomf
     G3Dev sàrl
-    George Lesica
     Gerrit Großkopf
     Grant Clarke
     Greg Olson
     Guldoman
     Haley Aycock
     Heribert Hirth
+    Hiroshi Naruo
     Hunter Jones
     ialex32x
     Igor Buzatovic
@@ -254,13 +258,11 @@ generous deed immortalized in the next stable release of Godot Engine.
     Jeff Hungerford
     Jeremy Kahn
     Jesse Dubay
-    Joao Senerchia
     Joel Fivat
     Johannes Wuensch
     Jonas Rudlang
     Jonas Yamazaki
     Jonathan G
-    Jonathan Martin
     Jonathan Nieto
     Jonathon
     Jon Bonazza
@@ -270,6 +272,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     Juan Negrier
     Judd
     Julian Murgia
+    Kajornthep Piyanun
     KC Chan
     Kevin Boyer
     Kiyohiro Kawamura (kyorohiro)
@@ -278,6 +281,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     KsyTek Games
     Kuan Cheang
     kycho
+    Levi Lindsey
     Linus Lind Lundgren
     Luis Moraes
     Macil
@@ -288,21 +292,26 @@ generous deed immortalized in the next stable release of Godot Engine.
     Matthias Grandis
     Matt Welke
     Maxwell
+    medecau
     Mertcan Mermerkaya
+    mhilbrunner
     Michael Dürwald
     Michael Gringauz
     Michael Labbe
     Mikael Olsson
+    Mikayla Hutchinson
     MoM
     Moritz Laass
     Moritz Weissenberger
     Natrim
     nee
     Neil Blakey-Milner
+    Nerdforge
     Nick Pavlica
     Niclas Eriksen
     Nicolás Montaña
     Nicolas SAN AGUSTIN
+    Oscar Norlander
     Pan Ip
     Patrick Nafarrete
     Paul Gieske
@@ -331,7 +340,6 @@ generous deed immortalized in the next stable release of Godot Engine.
     Simon Wenner
     Sootstone
     Theo Cranmore
-    Théo Hay
     Thibault Barbaroux
     Thomas Bell
     Thomas Holmes