diff --git a/.gitignore b/.gitignore
index 254786eb63..7156719927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ MANIFEST
 .ipynb_checkpoints
 .eggs
 pip-wheel-metadata
+.hypothesis
 
 # Sphinx
 _build
diff --git a/.mailmap b/.mailmap
index 700a2ccce5..9af20e3937 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,24 +5,32 @@ Adrian Damian <adrian.damian@nrc.ca> <Adrian.Damian@nrc.ca>
 Andrew O'Brien <obrienan@uwm.edu> <marxide@users.noreply.github.com>
 Austen Groener <Austen.Groener@gmail.com> <amg338@drexel.edu>
 Austen Groener <Austen.Groener@gmail.com> <rocketboyausten@gmail.com>
+Ayush Yadav <ayushyadav@outlook.com>
 Benjamin Alan Weaver <baweaver@lbl.gov> <benjamin.weaver@nyu.edu>
+Benjamin Alan Weaver <baweaver@lbl.gov> <benjamin.weaver@noirlab.edu>
 Brigitta Sipőcz <bsipocz@gmail.com>
 Brigitta Sipőcz <bsipocz@gmail.com> <b.sipocz@gmail.com>
-Clara Brasseur <cbrasseur@stsci.edu>
+Caden Armstrong <cadenarmstrong@gmail.com>
+Clara Brasseur <cebrasseur@gmail.com> <cbrasseur@stsci.edu>
+Clara Brasseur <cebrasseur@gmail.com>
 David Collom  <dmcollom@gmail.com> <david.m.collom@gmail.com>
 David Collom  <dmcollom@gmail.com> <dcollom@lco.global>
 David Collom  <dmcollom@gmail.com> <dcollom@localhost.localdomain>
 E. Madison Bray <erik.m.bray@gmail.com>
 E. Madison Bray <erik.m.bray@gmail.com> <embray@stsci.edu>
 Edward Gomez <edward@gomez.me.uk>
+Elena Colomo <ecolomo@sciops.esa.int>
 Eric Koch <koch.eric.w@gmail.com>
+Erwan Pannier <erwan.pannier@centralesupelec.fr>
 Fran Raga <franka1986@gmail.com> <All4Gis@users.noreply.github.com>
 Fred Moolekamp <fred3public@gmail.com>Magnus Persson <magnusp@vilhelm.nu> <vilhelmp@gmail.com>
 Hans Moritz Guenter <moritz.guenther@gmx.de>
 Henrik Norman <honke.norman@gmail.com> <Honke.norman@gmail.com>
 Henrik Norman <honke.norman@gmail.com> <hnorma@kth.se>
 Jaladh Singhal <jaladhsinghal@gmail.com>
+Javier Ballester <javier.ballester@ext.esa.int>
 Javier Duran <jduran@sciops.esa.int>
+Javier Duran <jduran@sciops.esa.int> <javier.duran@sciops.esa.int>
 Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-109.esac.esa.int>
 Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-144.esac.esa.int>
 Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-161.esac.esa.int>
@@ -33,6 +41,9 @@ Javier Espinosa <javier.espinosa@esa.int>
 Javier Espinosa <javier.espinosa@esa.int> <64952559+jespinosaar@users.noreply.github.com>
 Javier Espinosa <javier.espinosa@esa.int> <javier.espinosa@sciops.esa.int>
 Javier Espinosa <javier.espinosa@esa.int> <jespinosa@esac01107125.home>
+Javier Espinosa <javier.espinosa@esa.int> <j.espinosa.aranda@gmail.com>
+Jennifer Medina <jmedina@stsci.edu>
+Jesus Juan Salgado <jesusjuansalgado@gmail.com>
 Jonathan Gagne <jonathan.gagne.1@gmail.com>
 Jordan Mirocha <mirochaj@gmail.com> <mirocha@rl1-140-39-dhcp.int.colorado.edu>
 Juan Carlos Segovia <juancarlos.segovia@gmail.com>
@@ -56,6 +67,8 @@ Nicholas Earl <contact@nicholasearl.me>
 Oliver Oberdorf <ooberdorf@gemini.edu>
 Oliver Oberdorf <ooberdorf@gemini.edu> <oly@oberdorf.org>
 Pey Lian Lim <lim@stsci.edu> <2090236+pllim@users.noreply.github.com>
+Raul Gutierrez <raul.gutierrez@sciops.esa.int> <Raul Gutierrez@sciops.esa.int>
+Raul Gutierrez <raul.gutierrez@sciops.esa.int> <Raul.Gutierrez@sciops.esa.int>
 Simon Conseil <contact@saimon.org> <sconseil@gemini.edu>
 Simon Conseil <contact@saimon.org> <simon.conseil@univ-lyon1.fr>
 Simon Liedtke <liedtke.simon@googlemail.com>
@@ -63,5 +76,6 @@ Syed Gilani <sgilani@stsci.edu> <59292422+syed-gilani@users.noreply.github.com>
 Syed Gilani <sgilani@stsci.edu> <sgilani@sgilani.local.stsci.edu>
 Syed Gilani <sgilani@dmdtemp2020.local.stsci.edu>
 Tinuade Adeleke <summittinuade@gmail.com>
+Tim Galvin <gal16b@csiro.au>
 Volodymyr Savchenko <contact@volodymyrsavchenko.com> <Volodymyr.Savchenko@unige.ch>
 Volodymyr Savchenko <contact@volodymyrsavchenko.com> <volodymyrss@users.noreply.github.com>