diff --git a/.mailmap b/.mailmap
index 48da4f54b23828..16c9bf1ea21ef6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -110,6 +110,7 @@ Evan Lucas <evanlucas@me.com> <evan.lucas@help.com>
 FangDun Cai <cfddream@gmail.com> Fangdun Cai (Fundon) <cfddream@gmail.com>
 Fangshi He <hefangshi@gmail.com> hefangshi <hefangshi@gmail.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
+Fatah N <nfatah41@gmail.com> fatahn <nfatah41@gmail.com>
 Fedor Indutny <fedor@indutny.com> <fedor.indutny@gmail.com>
 Felix Böhm <felixboehm55@googlemail.com> <me@feedic.com>
 Felix Geisendörfer <felix@debuggable.com>
@@ -145,6 +146,7 @@ Imran Iqbal <imran@imraniqbal.org> <imrani@ca.ibm.com>
 Ionică Bizău <bizauionica@gmail.com> <bizauionica@yahoo.com>
 Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
+Isuru Siriwardana <isuruanatomy@gmail.com> isurusiri <isuruanatomy@gmail.com>
 Italo A. Casas <me@italoacasas.com> <italo@italoacasas.com>
 Jackson Tian <shyvo1987@gmail.com> <puling.tyq@alibaba-inc.com>
 Jake Verbaten <raynos2@gmail.com>
@@ -169,6 +171,7 @@ John Barboza <jbarboza@ca.ibm.com> jBarz <jBarz@users.noreply.github.com>
 John Barboza <jbarboza@ca.ibm.com> jBarz <jbarboza@ca.ibm.com>
 John Gardner <gardnerjohng@gmail.com> Alhadis <gardnerjohng@gmail.com>
 John McGuirk <johnmac81@gmail.com> jmcgui05 <johnmac81@gmail.com>
+John Musgrave <musgravejw@gmail.com> musgravejw <musgravejw@gmail.com>
 Johnny Ray Austin <johnny@johnnyray.me> Johnny Ray <http://johnnyray.me>
 Jon Tippens <jwtippens@gmail.com> legalcodes <jwtippens@gmail.com>
 Jonas Pfenniger <jonas@pfenniger.name> <jonas@stvs.ch>
@@ -365,6 +368,7 @@ Tom Hughes-Croucher <tom_croucher@yahoo.com>
 Tom Purcell <tpurcell@chariotsolutions.com> tpurcell <tpurcell@chariotsolutions.com>
 Tom White <tomtinkerer@gmail.com>
 Tomoki Okahana <umatomakun@gmail.com> umatoma <umatomakun@gmail.com>
+Tracy Hinds <tracyhinds@gmail.com> Tracy <tracyhinds@gmail.com>
 Travis Meisenheimer <travis@indexoutofbounds.com> <tmeisenh@gmail.com>
 Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Trivikram Kamat <trivikr.dev@gmail.com> <16024985+trivikr@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index dfacc53994b2d8..3a156cbd2cb373 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2139,5 +2139,63 @@ wangzengdi <sunnyadi@163.com>
 Garwah Lam <garwahlam@gmail.com>
 jaspal-yupana <jaspal@loopsoftware.fr>
 Arian Santrach <arian@findinapp.com>
+Forrest Wolf <Forrest.Weiswolf@gmail.com>
+Fatah N <nfatah41@gmail.com>
+Divyanshu Singh <dsinecos@gmail.com>
+FallenRiteMonk <fallenritemonk@gmail.com>
+Rajkumar Purushothaman <raj.dhandus@gmail.com>
+Chris Miller <chrismilleruk@gmail.com>
+Dave O'Mahony <david.c.omahony@gmail.com>
+nodeav <30617226+nodeav@users.noreply.github.com>
+Zhenzhen Zhan <zhanzhenzhen@hotmail.com>
+Ryusei Yamaguchi <mandel59@gmail.com>
+Kohei Hiraga <white.line.oar@gmail.com>
+Nick Filatov <keddofilatov@gmail.com>
+Jesse Gorzinski <jgorzinski@gmail.com>
+Pieter Mees <pieter.mees@zentrick.com>
+Malcolm White <malcolmwhite@google.com>
+Gerhard Stoebich <deb2001-github@yahoo.de>
+Matei Copot <matei@copot.eu>
+ikasumiwt <wtsnyk13@gmail.com>
+Gurin, Sebastian <sgurin@netsuite.com>
+Indranil Dasgupta <indranild@gmail.com>
+Harry Sarson <harry.sarson@hotmail.co.uk>
+Snehil Verma <vsnehil92@gmail.com>
+Joseph Gordon <gordonj@us.ibm.com>
+Antoine du HAMEL <duhamelantoine1995@gmail.com>
+Rémi Berson <remi@cliqz.com>
+Alec Larson <aleclarson@users.noreply.github.com>
+Daven Casia <davencasia@gmail.com>
+Isuru Siriwardana <isuruanatomy@gmail.com>
+Spencer Greene <spencerwgreene@gmail.com>
+Palash Nigam <npalash25@gmail.com>
+SheetJS <dev@sheetjs.com>
+Bryan Azofeifa <bazofeifa89@gmail.com>
+Christine E. Taylor <christine.e.taylor.sf@gmail.com>
+John Musgrave <musgravejw@gmail.com>
+Dhansuhu Uzumaki <a.p.dhanushu@gmail.com>
+Beni von Cheni <benjaminlchen@gmail.com>
+Ilya Sotov <sotovilya@yandex.ru>
+William Cohen <wcohen@redhat.com>
+Ajido <ajido@me.com>
+Mithun Sasidharan <msasidharan@paypal.com>
+kailash k yogeshwar <kailashyogeshwar85@gmail.com>
+Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
+Mark Tiedemann <www.marktiedemann@gmail.com>
+xsbchen <xsbchen@qq.com>
+Kyle Martin <kyle.martin@hotmail.co.nz>
+Denis Fäcke <serayaeryn@gmail.com>
+Daylor Yanes <daylor.yanes@gmail.com>
+Carrie Coxwell <carrie.coxwell@gmail.com>
+BeniCheni <benjaminlchen@gmail.com>
+Masashi Hirano <cherrydog07@gmail.com>
+Brandon Ruggles <brandonrninefive@gmail.com>
+Allen Yonghuang Wang <helloshuangzi@gmail.com>
+Yichao 'Peak' Ji <peakji@users.noreply.github.com>
+Jesse W. Collins <jesse.w.collins@gmail.com>
+TSUYUSATO Kitsune <make.just.on@gmail.com>
+daGo <daniel1kdago@gmail.com>
+Lambdac0re <Lambdac0re@users.noreply.github.com>
+Yulong Wang <f.s@qq.com>
 
 # Generated by tools/update-authors.sh