diff --git a/.mailmap b/.mailmap
index da93126120..662ea13a60 100644
--- a/.mailmap
+++ b/.mailmap
@@ -118,6 +118,7 @@ Michael Olbrich <m.olbrich@pengutronix.de>
 Michal Soltys <soltys@ziu.info> <nozo@ziu.info>
 Michal Suchanek <msuchanek@suse.de>
 Michal Suchanek <msuchanek@suse.de> <hramrach@gmail.com>
+Michal Sekletár <msekleta@redhat.com>
 Michał Szczepański <skrzatu@hotmail.com> <skrzatu@gmail.com>
 Michel Kraus <github@demonsphere.de> <27o@users.noreply.github.com>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@gmail.com>
@@ -207,3 +208,4 @@ Stephan Edel <se@se-it.eu>
 Andrey Yashkin <38919268+AndreyYashkin@users.noreply.github.com>
 Ronald Tschalär <ronald@innovation.ch>
 Jay Burger <jay.burger@fujitsu.com> <root@new-host-3.home>
+Yi Gao <ymuemc@163.com>
diff --git a/NEWS b/NEWS
index 36c2c930e8..23c5d9c820 100644
--- a/NEWS
+++ b/NEWS
@@ -548,23 +548,24 @@ CHANGES WITH 246:
           key/certificate parameters support this now.
 
         Contributions from: 24bisquitz, Adam Nielsen, Alan Perry, Alexander
-        Malafeev, Alin Popa, Amos Bird, Andreas Rammhold, AndreRH, Andrew
-        Doran, Anita Zhang, Ankit Jain, antznin, Arnaud Ferraris, Arthur Moraes
-        do Lago, Arusekk, Balaji Punnuru, Balint Reczey, Bastien Nocera,
-        bemarek, Benjamin Berg, Benjamin Dahlhoff, Benjamin Robin, Chris Down,
-        Chris Kerr, Christian Göttsche, Christian Hesse, Christian Oder,
-        Ciprian Hacman, codicodi, Corey Hinshaw, Daan De Meyer, Dana Olson, Dan
-        Callaghan, Daniel Fullmer, Daniel Rusek, Dan Streetman, Dave Reisner,
-        David Edmundson, David Wood, Denis Pronin, Diego Escalante Urrelo,
-        Dimitri John Ledkov, dolphrundgren, duguxy, Einsler Lee, Elisei Roca,
-        Emmanuel Garette, Eric Anderson, Eric DeVolder, Evgeny Vereshchagin,
-        ExtinctFire, fangxiuning, Ferran Pallarès Roca, Filipe Brandenburger,
-        Finn, Florian Klink, Franck Bui, Frantisek Sumsal, Gaoyi, gaurav, Georg
-        Müller, Gergely Polonkai, Giedrius Statkevičius, Gigadoc2, gogogogi,
-        gzjsgdsb, Hans de Goede, Haochen Tong, ianhi, ignapk, Jakov Smolic,
-        James T. Lee, Jan Janssen, Jan Klötzke, Jan Palus, Jay Burger, Jeremy
-        Cline, Jérémy Rosen, Jian-Hong Pan, Jiri Slaby, Joel Shapiro, Joerg
-        Behrmann, Jörg Thalheim, Jouke Witteveen, Kai-Heng Feng, Kenny
+        Malafeev, Alin Popa, Alvin Šipraga, Amos Bird, Andreas Rammhold,
+        AndreRH, Andrew Doran, Anita Zhang, Ankit Jain, antznin, Arnaud
+        Ferraris, Arthur Moraes do Lago, Arusekk, Balaji Punnuru, Balint
+        Reczey, Bastien Nocera, bemarek, Benjamin Berg, Benjamin Dahlhoff,
+        Benjamin Robin, Chris Down, Chris Kerr, Christian Göttsche, Christian
+        Hesse, Christian Oder, Ciprian Hacman, Clinton Roy, codicodi, Corey
+        Hinshaw, Daan De Meyer, Dana Olson, Dan Callaghan, Daniel Fullmer,
+        Daniel Rusek, Dan Streetman, Dave Reisner, David Edmundson, David Wood,
+        Denis Pronin, Diego Escalante Urrelo, Dimitri John Ledkov,
+        dolphrundgren, duguxy, Einsler Lee, Elisei Roca, Emmanuel Garette, Eric
+        Anderson, Eric DeVolder, Evgeny Vereshchagin, ExtinctFire, fangxiuning,
+        Ferran Pallarès Roca, Filipe Brandenburger, Filippo Falezza, Finn,
+        Florian Klink, Florian Mayer, Franck Bui, Frantisek Sumsal, gaurav,
+        Georg Müller, Gergely Polonkai, Giedrius Statkevičius, Gigadoc2,
+        gogogogi, gzjsgdsb, Hans de Goede, Haochen Tong, ianhi, ignapk, Jakov
+        Smolic, James T. Lee, Jan Janssen, Jan Klötzke, Jan Palus, Jay Burger,
+        Jeremy Cline, Jérémy Rosen, Jian-Hong Pan, Jiri Slaby, Joel Shapiro,
+        Joerg Behrmann, Jörg Thalheim, Jouke Witteveen, Kai-Heng Feng, Kenny
         Levinsen, Kevin Kuehler, Kumar Kartikeya Dwivedi, layderv, laydervus,
         Lénaïc Huard, Lennart Poettering, Lidong Zhong, Luca Boccassi, Luca
         BRUNO, Lucas Werkmeister, Lukas Klingsbo, Lukáš Nykrýn, Łukasz
@@ -572,19 +573,20 @@ CHANGES WITH 246:
         Holtmann, Marc Kleine-Budde, Martin Hundebøll, Matthew Leeds, Matt
         Ranostay, Maxim Fomin, MaxVerevkin, Michael Biebl, Michael Chapman,
         Michael Gubbels, Michael Marley, Michał Bartoszkiewicz, Michal Koutný,
-        Michal Sekletar, Michal Sekletár, Mike Gilbert, Mike Kazantsev, ml,
+        Michal Sekletár, Mike Gilbert, Mike Kazantsev, Mikhail Novosyolov, ml,
         Motiejus Jakštys, nabijaczleweli, nerdopolis, Niccolò Maggioni, Niklas
         Hambüchen, Norbert Lange, Paul Cercueil, pelzvieh, Peter Hutterer,
         Piero La Terza, Pieter Lexis, Piotr Drąg, Rafael Fontenelle, Richard
         Petri, Ronan Pigott, Ross Lagerwall, Rubens Figueiredo, satmandu,
-        Sean-StarLabs, Sebastian Jennen, sterlinghughes, Susant Sahani, Thomas
-        Haller, Tobias Hunger, Tom, Tomáš Pospíšek, Tomer Shechner, Tom Hughes,
-        Topi Miettinen, Tudor Roman, Uwe Kleine-König, Valery0xff, Vito Caputo,
-        Vladimir Panteleev, Vladyslav Tronko, Wen Yang, Yegor Vialov, Yigal
-        Korman, YmrDtnJu, Yuri Chornoivan, Yu Watanabe, Zbigniew
-        Jędrzejewski-Szmek, Zhu Li, Дамјан Георгиевски, наб
+        Sean-StarLabs, Sebastian Jennen, sterlinghughes, Surhud More, Susant
+        Sahani, szb512, Thomas Haller, Tobias Hunger, Tom, Tomáš Pospíšek,
+        Tomer Shechner, Tom Hughes, Topi Miettinen, Tudor Roman, Uwe
+        Kleine-König, Valery0xff, Vito Caputo, Vladimir Panteleev, Vladyslav
+        Tronko, Wen Yang, Yegor Vialov, Yigal Korman, Yi Gao, YmrDtnJu, Yuri
+        Chornoivan, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, Zhu Li, Дамјан
+        Георгиевски, наб
 
-        – Warsaw, 2020-07-09
+        – Warsaw, 2020-07-24
 
 CHANGES WITH 245: