diff --git a/.mailmap b/.mailmap
index c033d1e6cf..2ba6ee2b2a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -134,6 +134,7 @@ Brian Goff <cpuguy83@gmail.com> <cpuguy@hey.com>
 Calvin Liu <flycalvin@qq.com>
 Cameron Sparr <gh@sparr.email>
 Carlos de Paula <me@carlosedp.com>
+Carson Lenze <carsonlenze@gmail.com>
 Chander Govindarajan <chandergovind@gmail.com>
 Chao Wang <wangchao.fnst@cn.fujitsu.com> <chaowang@localhost.localdomain>
 Charles Hooper <charles.hooper@dotcloud.com> <chooper@plumata.com>
@@ -385,8 +386,10 @@ Julien Bordellier <julienbordellier@gmail.com> <git@julienbordellier.com>
 Julien Bordellier <julienbordellier@gmail.com> <me@julienbordellier.com>
 Jun Du <dujun5@huawei.com>
 Justin Cormack <justin.cormack@specialbusservice.com>
+Justin Cormack <justin.cormack@specialbusservice.com> <justin.cormack@docker.com>
 Justin Cormack <justin.cormack@specialbusservice.com> <justin.cormack@unikernel.com>
 Justin Cormack <justin.cormack@specialbusservice.com> <justin@docker.com>
+Justin Cormack <justin.cormack@specialbusservice.com> <justin@specialbusservice.com>
 Justin Keller <85903732+jk-vb@users.noreply.github.com>
 Justin Keller <85903732+jk-vb@users.noreply.github.com> <jkeller@vb-jkeller-mbp.local>
 Justin Simonelis <justin.p.simonelis@gmail.com> <justin.simonelis@PTS-JSIMON2.toronto.exclamation.com>
@@ -547,6 +550,7 @@ Paul Liljenberg <liljenberg.paul@gmail.com> <letters@paulnotcom.se>
 Pavel Tikhomirov <ptikhomirov@virtuozzo.com> <ptikhomirov@parallels.com>
 Pawel Konczalski <mail@konczalski.de>
 Paweł Gronowski <pawel.gronowski@docker.com>
+Paweł Gronowski <pawel.gronowski@docker.com> <git@grono.dev>
 Paweł Gronowski <pawel.gronowski@docker.com> <me@woland.xyz>
 Peter Choi <phkchoi89@gmail.com> <reikani@Peters-MacBook-Pro.local>
 Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com>
@@ -567,6 +571,7 @@ Qin TianHuan <tianhuan@bingotree.cn>
 Ray Tsang <rayt@google.com> <saturnism@users.noreply.github.com>
 Renaud Gaubert <rgaubert@nvidia.com> <renaud.gaubert@gmail.com>
 Richard Scothern <richard.scothern@gmail.com>
+Ritesh Vishwakarma <riteshvishwakarma.work@gmail.com>
 Rob Murray <rob.murray@docker.com>
 Rob Murray <rob.murray@docker.com> <148866618+robmry@users.noreply.github.com>
 Robert Terhaar <rterhaar@atlanticdynamic.com> <robbyt@users.noreply.github.com>
@@ -605,6 +610,8 @@ Seongyeol Lim <seongyeol37@gmail.com>
 Serhii Nakon <serhii.n@thescimus.com>
 Shaun Kaasten <shaunk@gmail.com>
 Shawn Landden <shawn@churchofgit.com> <shawnlandden@gmail.com>
+Shaun Thompson <shaun.thompson@docker.com>
+Shaun Thompson <shaun.thompson@docker.com> <30006198+thompson-shaun@users.noreply.github.com>
 Shengbo Song <thomassong@tencent.com>
 Shengbo Song <thomassong@tencent.com> <mymneo@163.com>
 Shih-Yuan Lee <fourdollars@gmail.com>
@@ -694,6 +701,8 @@ Tushar Sariya <tushar.97@hotmail.com>
 Tyler Brown <tylers.pile@gmail.com>
 Umesh Yadav <umesh4257@gmail.com>
 Umesh Yadav <umesh4257@gmail.com> <dungeonmaster18@users.noreply.github.com>
+Vedant Madane <vedant.madane@gmail.com>
+Vedant Madane <vedant.madane@gmail.com> <6527493+VedantMadane@users.noreply.github.com>
 Victor Lyuboslavsky <victor@victoreda.com>
 Victor Vieux <victor.vieux@docker.com> <dev@vvieux.com>
 Victor Vieux <victor.vieux@docker.com> <victor.vieux@dotcloud.com>
@@ -726,6 +735,7 @@ Wang Chao <chao.wang@ucloud.cn> <wcwxyz@gmail.com>
 Wang Guoliang <liangcszzu@163.com>
 Wang Jie <wangjie5@chinaskycloud.com>
 Wang Ping <present.wp@icloud.com>
+Wang Xiaosong <wang.xiaosong1@zte.com.cn>
 Wang Xing <hzwangxing@corp.netease.com> <root@localhost>
 Wang Yuexiao <wang.yuexiao@zte.com.cn>
 Wayne Chang <wayne@neverfear.org>
diff --git a/AUTHORS b/AUTHORS
index 7fd7bd7a56..244a55127f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -112,6 +112,7 @@ Alexei Margasov <alexei38@yandex.ru>
 Alexey Guskov <lexag@mail.ru>
 Alexey Kotlyarov <alexey@infoxchange.net.au>
 Alexey Shamrin <shamrin@gmail.com>
+Alexis Couvreur <alexiscouvreur.pro@gmail.com>
 Alexis Ries <ries.alexis@gmail.com>
 Alexis Thomas <fr.alexisthomas@gmail.com>
 Alfred Landrum <alfred.landrum@docker.com>
@@ -164,6 +165,7 @@ Andrew He <he.andrew.mail@gmail.com>
 Andrew Hsu <andrewhsu@docker.com>
 Andrew Kim <taeyeonkim90@gmail.com>
 Andrew Kuklewicz <kookster@gmail.com>
+Andrew Liu <andrewjliu22@gmail.com>
 Andrew Macgregor <andrew.macgregor@agworld.com.au>
 Andrew Macpherson <hopscotch23@gmail.com>
 Andrew Martin <sublimino@gmail.com>
@@ -235,6 +237,7 @@ Arun Gupta <arun.gupta@gmail.com>
 Asad Saeeduddin <masaeedu@gmail.com>
 Asbjørn Enge <asbjorn@hanafjedle.net>
 Ashly Mathew <ashly.mathew@sap.com>
+Ashutosh Anand <ashutoshanand2560@gmail.com>
 Austin Vazquez <austin.vazquez.dev@gmail.com>
 averagehuman <averagehuman@users.noreply.github.com>
 Avi Das <andas222@gmail.com>
@@ -351,6 +354,7 @@ Carlos Alexandro Becker <caarlos0@gmail.com>
 Carlos de Paula <me@carlosedp.com>
 Carlos Sanchez <carlos@apache.org>
 Carol Fager-Higgins <carol.fager-higgins@docker.com>
+Carson Lenze <carsonlenze@gmail.com>
 carsontham <carsontham@outlook.com>
 Cary <caryhartline@users.noreply.github.com>
 Casey Bisson <casey.bisson@joyent.com>
@@ -524,7 +528,9 @@ Daniele Rondina <geaaru@sabayonlinux.org>
 Danny Berger <dpb587@gmail.com>
 Danny Milosavljevic <dannym@scratchpost.org>
 Danny Yates <danny@codeaholics.org>
+Danyal Ahmed <58849388+danyalahmed1995@users.noreply.github.com>
 Danyal Khaliq <danyal.khaliq@tenpearls.com>
+Darafei Praliaskouski <me@komzpa.net>
 Darren Coxall <darren@darrencoxall.com>
 Darren Shepherd <darren.s.shepherd@gmail.com>
 Darren Stahl <darst@microsoft.com>
@@ -766,6 +772,7 @@ Ferran Rodenas <frodenas@gmail.com>
 Filipe Brandenburger <filbranden@google.com>
 Filipe Oliveira <contato@fmoliveira.com.br>
 Filipe Pina <hzlu1ot0@duck.com>
+Firas Mosbehi <firas.mosbehi@insat.ucar.tn>
 Flavio Castelli <fcastelli@suse.com>
 Flavio Crisciani <flavio.crisciani@docker.com>
 Florian <FWirtz@users.noreply.github.com>
@@ -1221,7 +1228,7 @@ Jussi Nummelin <jussi.nummelin@gmail.com>
 Justas Brazauskas <brazauskasjustas@gmail.com>
 Justen Martin <jmart@the-coder.com>
 Justin Chadwell <me@jedevc.com>
-Justin Cormack <justin.cormack@docker.com>
+Justin Cormack <justin.cormack@specialbusservice.com>
 Justin Force <justin.force@gmail.com>
 Justin Keller <85903732+jk-vb@users.noreply.github.com>
 Justin Menga <justin.menga@gmail.com>
@@ -1263,6 +1270,7 @@ Kazuyoshi Kato <katokazu@amazon.com>
 Ke Li <kel@splunk.com>
 Ke Xu <leonhartx.k@gmail.com>
 Kei Ohmura <ohmura.kei@gmail.com>
+Keith Collister <hnefatl@gmail.com>
 Keith Hudgins <greenman@greenman.org>
 Keli Hu <dev@keli.hu>
 Ken Bannister <kb2ma@runbox.com>
@@ -1390,6 +1398,7 @@ Liz Zhang <lizzha@microsoft.com>
 LIZAO LI <lzlarryli@gmail.com>
 Lizzie Dixon <_@lizzie.io>
 Lloyd Dewolf <foolswisdom@gmail.com>
+Lohit Kolluri <lohitkolluri@gmail.com>
 Lokesh Mandvekar <lsm5@fedoraproject.org>
 longliqiang88 <394564827@qq.com>
 Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
@@ -1425,6 +1434,7 @@ Mabin <bin.ma@huawei.com>
 Madhan Raj Mookkandy <MadhanRaj.Mookkandy@microsoft.com>
 Madhav Puri <madhav.puri@gmail.com>
 Madhu Venugopal <mavenugo@gmail.com>
+Mads Jon Nielsen <madsjon@gmail.com>
 Mageee <fangpuyi@foxmail.com>
 maggie44 <64841595+maggie44@users.noreply.github.com>
 Mahesh Tiyyagura <tmahesh@gmail.com>
@@ -1622,6 +1632,7 @@ Miklos Szegedi <miklos.szegedi@cloudera.com>
 Milas Bowman <devnull@milas.dev>
 Milind Chawre <milindchawre@gmail.com>
 Miloslav Trmač <mitr@redhat.com>
+Minghang Li <24727729+minghangli-uni@users.noreply.github.com>
 mingqing <limingqing@cyou-inc.com>
 Mingzhen Feng <fmzhen@zju.edu.cn>
 Misty Stanley-Jones <misty@docker.com>
@@ -1711,6 +1722,7 @@ Nikolay Edigaryev <edigaryev@gmail.com>
 Nikolay Milovanov <nmil@itransformers.net>
 ningmingxiao <ning.mingxiao@zte.com.cn>
 Nirmal Mehta <nirmalkmehta@gmail.com>
+Nishant Maheshwari <mnishant222@gmail.com>
 Nishant Totla <nishanttotla@gmail.com>
 NIWA Hideyuki <niwa.niwa@nifty.ne.jp>
 Noah Meyerhans <nmeyerha@amazon.com>
@@ -1877,6 +1889,7 @@ Raghuram Devarakonda <draghuram@gmail.com>
 Raja Sami <raja.sami@tenpearls.com>
 Rajat Pandit <rp@rajatpandit.com>
 Rajdeep Dua <dua_rajdeep@yahoo.com>
+Rajnish Kumar <rajnishkumar448@gmail.com>
 Ralf Sippl <ralf.sippl@gmail.com>
 Ralle <spam@rasmusa.net>
 Ralph Bean <rbean@redhat.com>
@@ -1915,6 +1928,7 @@ Rik Nijessen <rik@keefo.nl>
 Riku Voipio <riku.voipio@linaro.org>
 Riley Guerin <rileytg.dev@gmail.com>
 Ritesh H Shukla <sritesh@vmware.com>
+Ritesh Vishwakarma <riteshvishwakarma.work@gmail.com>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 Rob Cowsill <42620235+rcowsill@users.noreply.github.com>
 Rob Gulewich <rgulewich@netflix.com>
@@ -2008,6 +2022,8 @@ s. rannou <mxs@sbrk.org>
 Sabin Basyal <sabin.basyal@gmail.com>
 Sachin Joshi <sachin_jayant_joshi@hotmail.com>
 Sagar Hani <sagarhani33@gmail.com>
+Sahana Narasipura Vasudevarao <nvsahanarao@gmail.com>
+Sahil Singh <sahiilsiingh37@gmail.com>
 Sainath Grandhi <sainath.grandhi@intel.com>
 Sakeven Jiang <jc5930@sina.cn>
 Salahuddin Khan <salah@docker.com>
@@ -2195,6 +2211,7 @@ Sören Tempel <soeren+git@soeren-tempel.net>
 Tabakhase <mail@tabakhase.com>
 Tadej Janež <tadej.j@nez.si>
 Tadeusz Dudkiewicz <tadeusz.dudkiewicz@rtbhouse.com>
+Takumi Akasaka <takumiakasaka1231@gmail.com>
 Takuto Sato <tockn.jp@gmail.com>
 tang0th <tang0th@gmx.com>
 Tangi Colin <tangicolin@gmail.com>
@@ -2333,7 +2350,8 @@ vagrant <vagrant@ubuntu-14.04-amd64-vbox>
 Vaidas Jablonskis <jablonskis@gmail.com>
 Valentin Kulesh <valentin.kulesh@virtuozzo.com>
 vanderliang <lansheng@meili-inc.com>
-Vedant Madane <6527493+VedantMadane@users.noreply.github.com>
+Varun Hotani <varunhotani@gmail.com>
+Vedant Madane <vedant.madane@gmail.com>
 Velko Ivanov <vivanov@deeperplane.com>
 Veres Lajos <vlajos@gmail.com>
 Viacheslav Gagara <viacheslavg@gmail.com>
@@ -2390,6 +2408,7 @@ Wang Ping <present.wp@icloud.com>
 Wang Xing <hzwangxing@corp.netease.com>
 Wang Yuexiao <wang.yuexiao@zte.com.cn>
 Wang Yumu <37442693@qq.com>
+wang.xiaosong <wang.xiaosong1@zte.com.cn>
 wanghuaiqing <wanghuaiqing@loongson.cn>
 Ward Vandewege <ward@jhvc.com>
 WarheadsSE <max@warheads.net>