[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4e5a35c123926c1a2a1b8d831f59563fd436835b

3 Dec 2020

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  4e5a35c123926c1a2a1b8d831f59563fd436835b (commit)
       via  e1253a4d348f23d0d368ef69bc213b184acb8b56 (commit)
       via  b689391f272ca09b8724f094ab0700890cba13db (commit)
       via  a11783096e5a9db51ba850207c4956d449e4b627 (commit)
       via  bb5dcf84b8e586b2713bac963486f1fdcf15aa2b (commit)
       via  77b7668c9ea4d758c8fb2a2b044a1c4f47ab8a94 (commit)
       via  57a0aedb3ebf95a20448e66c1f58b5e4dc672853 (commit)
       via  05be1c642a9c8ee9aff2acbc4ea8b3b1a8065f7c (commit)
       via  83fc11d474f3f4be6aa4aa51a6c0cec56f4efdea (commit)
       via  6dc6de4c4ec2a8d41d8a61ce0c9559f923188169 (commit)
       via  882db5cd03dcd72fea7c11b80672951ba55e8cfd (commit)
       via  848911b24757d6367e325985f860fbf73f811875 (commit)
       via  aa9dd5386cfac0ea069c4f6d51628e3d7ea56458 (commit)
       via  460741fd148107b5e189d5649009c4ab36007855 (commit)
       via  ebcecb4be40e014a4cc6117564fb07761c18324c (commit)
       via  5e5a470399cc2f1b377de7ecacfd1dffe90b89fc (commit)
       via  31098f84abea3288c775339f432a492e4abeeb6b (commit)
       via  5ad244623711541969613a883012af3d13fa364b (commit)
       via  820edb2374ef3af02e8fa37a4b1acebefcc6317c (commit)
       via  e8ecc81a70f504430f2f0791789de4778f938fe3 (commit)
       via  5fa842475cd1059b2c1ddf6a7bcfbd7830ad7bd2 (commit)
       via  1e036ee90d098ab3dc62b2478dd2ce67b54a05e9 (commit)
       via  c2773f237192aac6d4ff296c46cb32cb5f4aab00 (commit)
       via  a260df361f462a3ed908f7105c1ac7883a5f7327 (commit)
       via  5c33a76135106614591684668bfe76f0ba8cdbff (commit)
       via  fc31c28d5c1d54a81991a77fda7efbc482f04565 (commit)
       via  8797526d36e432aed406f6b5d8091358c30d2720 (commit)
       via  96d0c76154fe1b52796517afa7afe23f1d888638 (commit)
       via  4a388bc9f08909bd95831a7fc00b643a72a7360d (commit)
       via  8a4495a41f9bef41bb8e2c87cdd6556869bcd03e (commit)
       via  7adacda04c2ca766bd25ac62aa17cdbeadaa1abc (commit)
       via  b952a52b706da0d0cc208dbc6870785d7460c32b (commit)
       via  d6989b4b0b42937485f5008cda6cdd730275f1ec (commit)
       via  0be475ca366e1ed9c4e998d2da2185e430100b86 (commit)
       via  0291b69ec61956ec528e30a102a428d5eac2405e (commit)
       via  7547296f68260b578ce55650c86bb26282ab62be (commit)
       via  7c507f3d5bd855aa30ed4c11a2c43c0e42350ae3 (commit)
       via  5efe8957a553d024a95a1201672a0755b8084e39 (commit)
       via  ef999913709afb81e647eff2f96a831a310c889b (commit)
       via  3198520570e962e4115315ffbec04c5eda9f552b (commit)
       via  ef14d8a064af141a1f1c4acccd6cf70ccc443304 (commit)
       via  76da59bba60fa3d3012b6e026fb5451d0c3a7bfe (commit)
       via  27023de9317001140f12aaa07d09ddd2408fb007 (commit)
       via  e4f287a268c490e393e2e7ffd5bdd8246c3d3f76 (commit)
       via  2cb220fd3cbff4382656b30d02facdd9df81775e (commit)
       via  d0d63bbbee087e8865be40739aec6395e065b9f4 (commit)
       via  17a8437e82c5a9aceb058ae49b6e3ae94b84263e (commit)
       via  9e245967d21883c6b921c0f1d9101a526ef9b084 (commit)
       via  7a6bac40fd889b6852791bcde2c1a25ae3bdf65e (commit)
       via  82973fae144d199c10332a174848db6eaddc1355 (commit)
       via  74e19a563c34ada957056a5db3ba4049f9f17c45 (commit)
       via  f8bf19c92e8b99b097754847f85cc17509135731 (commit)
       via  a4420101a8b1f755b4ca825e3fd0e3cd3fde0414 (commit)
       via  6cab8977e03b5795a240d3b21db0a2387d83aaa8 (commit)
       via  5929646842d960fab6c1cbd78f2d48ace344d76d (commit)
       via  78a6918d34730286fb174c0bd623485636b44d9f (commit)
       via  05db64d0ea36e3f4be816d5818ce755d7e02b9d1 (commit)
       via  e704dbe6bd661385d19bcc874f95b2ba4dbcce46 (commit)
       via  1a3c53556ec34cefce9a422ff64b88af35d8663b (commit)
       via  7b405169be7cb8cabee09490b43fc8ea65ca5cde (commit)
       via  a832b5c2e6f96bef108457d36945ea5d5fa961b3 (commit)
       via  11b46800a5391ca9cffdec29e4c61a0bd32ab419 (commit)
       via  1c612d9e326a477bb1cbad719702c51c35f11d62 (commit)
       via  ff699760213bc8a08ced5fc003a9041d8e1e0b51 (commit)
       via  64d6b06a6d795e7ee1309e30fa142fc3d8d2172b (commit)
       via  81e87afb7b81208f35e2dc40117b7762c31ad7ed (commit)
       via  2e1bf458e2930cf1d69aa9fa3d6e7ebd25022f40 (commit)
       via  1ba481b3f4d9e31a8d02cdec447e7bff12631318 (commit)
       via  358e42ffbf5e8dd58e3f5c71afe2a90a05ce8754 (commit)
       via  4dc8de6f2230a77634d2a43cfc0231d9369dfeea (commit)
       via  7b82ca1fc831af523f612cd9635fc45aa3a8e6ca (commit)
       via  81f80af9877eec84bf51e14290bb89782ba8fc96 (commit)
       via  2293e1de0bef48e607ff4701bad07863d9ed57ee (commit)
       via  66c9d821d6252d3c0c50b2dcd37910002c8dcdf5 (commit)
       via  d08452c5055cccc9cb5c2a0dedf661cf50d28679 (commit)
       via  65ef52a33564f7fd41825aa01e0417c234690eab (commit)
       via  f60ae20cc86b5c1667432f29add09e65bc4048dd (commit)
       via  5cebcd805a5eb9d4ce930a6a9878c40bdc9b76d9 (commit)
       via  1c217406f2dfd7bba3e21c99df328d9b71407d1b (commit)
       via  0163c62dee8e53612e661498dbe6fca7dec74b10 (commit)
       via  85c2e400ff92ec8e7069284c1d0f6f52c39a40da (commit)
       via  e23b3b08a889dbd3e7fa6a31b4c481f30cc65dff (commit)
       via  7b97337afb4576d4bacbe854e8822e97b4cd1a40 (commit)
       via  07e42be9783ddfe2c6e49d98676fcdb7f2dfecd7 (commit)
       via  427190d5789b02331cb91d72f0fb7f97374a0aa0 (commit)
       via  5bf91fe1b1fb04e9dd422bdc1638e2592fd073b8 (commit)
       via  f46fd078148d4c6959e7ab3c52f1911bd8fea9a6 (commit)
       via  b62d7e0cc71cc1ff23d66dd8baf0f5f3c5c7a29b (commit)
       via  9141282b09db282ae202302e25da4ed924e8deec (commit)
       via  0c6112b0b3478a2a3e088e4fd264af2ee0d88408 (commit)
       via  743808bb8ece981efbb57a483f01618ad0fd7107 (commit)
       via  f52155611182ebcdec33de7dcd38994464d1ddf3 (commit)
       via  68fbcc0ee3ff0caf786abc3d2c126feff3f23204 (commit)
       via  731fc207deda875ffbeb890f42dc3296aea5b061 (commit)
       via  b474e87bb8a4199fb20e88d5a98593817ecd3f3f (commit)
       via  02489761db7c09293638cad52754a321f88b5cf4 (commit)
       via  dcd0bcef7eeee7b2cec036b49006f1af951fafd4 (commit)
       via  a30f94ac4a5616e56fbcb49404c572e596840ab3 (commit)
       via  1cd27f38e6b9d617f167427eeb451d73e21c1352 (commit)
       via  7f235b5b01fb045c28c47f2216f8531cfd80a981 (commit)
       via  1367738dfcc2844b71a4cf7fc36ea50ba01b4d6c (commit)
       via  60985e75c8d783cadb1e5f6e30f3c153f5773e43 (commit)
       via  c63ea6cf49daacd51a77f9c2bbcf9856f686a0f7 (commit)
       via  f717db9172b631571cfcd9333de45c110b772ff6 (commit)
       via  699c61109a71c81b987df65746afdb2abb7ef411 (commit)
       via  3bd2e64eb21c977b8d97045e90c2151444077783 (commit)
       via  f55a00fea31cde7291f09a42eb8481336f87b8a3 (commit)
       via  0f2d70a313bbd9141fa7de066f0bb8446e608bde (commit)
       via  987826deb1bdd394efa85602ad16922d160da8ae (commit)
       via  1b2ddfa4498d53e53c6681f5b2f4f1028cafed80 (commit)
       via  3e2668dcfa35052c8b988e1156dff5775afa6b97 (commit)
       via  58b374c255df2b59ecda3814d41cb4bad0d01fa6 (commit)
       via  9c6fd77927cbbf1cedb5d8a0dbc1367b7af17198 (commit)
       via  62efd2e9d26b78fe83b850dc43a9206556a2d851 (commit)
       via  7f5d63c9e661d8d9feab2723944dc04739205b4b (commit)
       via  5cbc22ffa69b8095251a75194a5695b1e7a70fe0 (commit)
       via  588f1223f2f9fbb30557d85d87ba14421735bd0c (commit)
       via  9d29a52d7d0d0d7db2cb957fbb628b943bba40aa (commit)
       via  ef7b7b1af8c32bad066ab35dbeabbd3a47d89b4b (commit)
       via  d941effbcfd3344aa244c3f8550fe72bb21af8db (commit)
       via  4e49d67990b8509d12114f868d48469d41e4b06a (commit)
       via  e1f7cc9077411dac342436441a4ea1a818f80b05 (commit)
       via  ae432a5f39980cd680e281378f8729719757ad6e (commit)
       via  66970ccba3a74a8fd6338364a215496f6394f3ad (commit)
       via  5e1579023ad452558424cd64f93dd5d1f57f61cb (commit)
       via  af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c (commit)
       via  5e11ef0f67f6baf9bbcb4e20f0987044397f5862 (commit)
       via  8a2105b2844fdb4b2306a0a27553f01842795535 (commit)
       via  1f3f2d676eff32f20d32f7ecfea45f235c9355fa (commit)
       via  aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06 (commit)
       via  7e5045312cce99db4f9055f3bf08c9edf98ee243 (commit)
       via  4ea6112ff02fe2ff3e7785e05f6671c729b64b6b (commit)
       via  3e19f681a147ae2f213035f505fc84dc77142caa (commit)
       via  6483ec30b93d32046ded45e9847cd8f46ee351e6 (commit)
       via  13cbb92ad415680c9501b896cd858d3ec6de5074 (commit)
       via  75f3182a394af273e91a7f721350d88923b45bb3 (commit)
       via  4744e4f00a0081284eee997de3b8f1b907dfe8fe (commit)
       via  f832c7581f0be9247be564e660b4d31ad86058e4 (commit)
       via  c472a30f30a6775fd263661ab89c69f88b1297f1 (commit)
       via  aa90ed9c20bc95942742dd12ae2d6a7459dece40 (commit)
       via  0937bd9c01fd4c56fdee688e887958dc72a9b03b (commit)
       via  0cdb151831f88725a53d26341cb10c80fb24cb1d (commit)
       via  150378eae9b19e04c36392ada2281eb1849a8ae8 (commit)
      from  31cbb589d9c8610ba0d9b15e2cb1612ac05912a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4e5a35c123926c1a2a1b8d831f59563fd436835b
Merge: 31cbb589d e1253a4d3
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Dec 3 12:55:36 2020 +0000
Merge branch 'next' into master
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/amavisd/amavisd.conf                        |  438 ---
 config/backup/includes/apcupsd                     |    1 +
 config/cfgroot/location-functions.pl               |  116 +-
 config/etc/sysctl.conf                             |    3 +
 config/firewall/rules.pl                           |    9 +-
 config/hostapd/config                              |  127 +-
 config/kernel/kernel.config.aarch64-ipfire         |    6 +-
 config/kernel/kernel.config.armv5tel-ipfire-multi  |    2 +-
 config/kernel/kernel.config.i586-ipfire            |    3 +-
 config/kernel/kernel.config.x86_64-ipfire          |    3 +-
 config/ntp/ntp.conf                                |    6 +
 config/rootfiles/common/aarch64/linux              |    5 +-
 config/rootfiles/common/curl                       |    9 +-
 config/rootfiles/common/file                       |    2 +-
 config/rootfiles/common/gdb                        |   63 +
 config/rootfiles/common/i586/intel-microcode       |    6 +
 config/rootfiles/common/libarchive                 |    4 +-
 config/rootfiles/common/libloc                     |    3 +
 config/rootfiles/common/openvpn                    |    1 -
 config/rootfiles/common/suricata                   |    1 +
 config/rootfiles/common/tzdata                     |    9 +-
 config/rootfiles/common/usb_modeswitch_data        |   26 +
 config/rootfiles/common/web-user-interface         |    1 +
 config/rootfiles/common/x86_64/go                  |  879 +++--
 config/rootfiles/common/x86_64/intel-microcode     |    6 +
 config/rootfiles/core/{152 => 153}/exclude         |    0
 .../124 => core/153}/filelists/aarch64/linux       |    0
 .../153}/filelists/aarch64/linux-initrd            |    0
 .../153}/filelists/armv5tel/linux-initrd-multi     |    0
 .../153}/filelists/armv5tel/linux-multi            |    0
 .../{oldcore/139 => core/153}/filelists/bash       |    0
 .../{oldcore/104 => core/153}/filelists/curl       |    0
 .../{oldcore/104 => core/153}/filelists/ddns       |    0
 .../{oldcore/106 => core/153}/filelists/file       |    0
 .../{oldcore/148 => core/153}/filelists/files      |   31 +-
 .../{oldcore/132 => core/153}/filelists/hwdata     |    0
 .../153}/filelists/i586/intel-microcode            |    0
 .../{oldcore/100 => core/153}/filelists/i586/linux |    0
 .../100 => core/153}/filelists/i586/linux-initrd   |    0
 .../131 => core/153}/filelists/ids-ruleset-sources |    0
 config/rootfiles/core/{152 => 153}/filelists/knot  |    0
 .../{oldcore/104 => core/153}/filelists/libarchive |    0
 .../rootfiles/core/{152 => 153}/filelists/libhtp   |    0
 .../rootfiles/core/{152 => 153}/filelists/libloc   |    0
 .../{oldcore/111 => core/153}/filelists/logwatch   |    0
 .../{oldcore/100 => core/153}/filelists/openvpn    |    0
 .../{oldcore/106 => core/153}/filelists/strongswan |    0
 .../rootfiles/core/{152 => 153}/filelists/suricata |    0
 .../{oldcore/100 => core/153}/filelists/tzdata     |    0
 .../106 => core/153}/filelists/usb_modeswitch      |    0
 .../106 => core/153}/filelists/usb_modeswitch_data |    0
 .../153}/filelists/x86_64/intel-microcode          |    0
 .../100 => core/153}/filelists/x86_64/linux        |    0
 .../100 => core/153}/filelists/x86_64/linux-initrd |    0
 .../rootfiles/{oldcore/150 => core/153}/update.sh  |   22 +-
 config/rootfiles/oldcore/{149 => 152}/exclude      |    0
 .../{core => oldcore}/152/filelists/aarch64/python |    0
 .../152/filelists/aarch64/python3                  |    0
 .../152/filelists/armv5tel/python                  |    0
 .../152/filelists/armv5tel/python3                 |    0
 .../152/filelists/ca-certificates                  |    0
 .../{core => oldcore}/152/filelists/files          |    0
 .../{core => oldcore}/152/filelists/i586/python    |    0
 .../{core => oldcore}/152/filelists/i586/python3   |    0
 .../rootfiles/{core => oldcore}/152/filelists/knot |    0
 .../{core => oldcore}/152/filelists/libhtp         |    0
 .../{core => oldcore}/152/filelists/setup          |    0
 .../{core => oldcore}/152/filelists/suricata       |    0
 .../{core => oldcore}/152/filelists/unbound        |    0
 .../{core => oldcore}/152/filelists/x86_64/python  |    0
 .../{core => oldcore}/152/filelists/x86_64/python3 |    0
 .../rootfiles/{core => oldcore}/152/filelists/yaml |    0
 config/rootfiles/{core => oldcore}/152/update.sh   |    0
 config/rootfiles/packages/aarch64/vdr_dvbapi       |    2 +-
 config/rootfiles/packages/amavisd                  |    7 -
 config/rootfiles/packages/apcupsd                  |    1 +
 config/rootfiles/packages/armv5tel/vdr_dvbapi      |    2 +-
 config/rootfiles/packages/aws-cli                  | 3097 +++++++++++++++-
 config/rootfiles/packages/ghostscript              |  403 +-
 config/rootfiles/packages/git                      |    6 +-
 config/rootfiles/packages/i586/vdr_dvbapi          |    4 +-
 config/rootfiles/packages/libseccomp               |    2 +-
 config/rootfiles/packages/lynis                    |    1 +
 config/rootfiles/packages/pcengines-apu-firmware   |   11 +-
 config/rootfiles/packages/python3-botocore         |  123 +-
 config/rootfiles/packages/python3-urllib3          |   52 +
 config/rootfiles/packages/spamassassin             |  228 --
 config/rootfiles/packages/transmission             |    2 +
 config/rootfiles/packages/vdr_eepg                 |    2 +-
 config/rootfiles/packages/vdr_epgsearch            |    8 +-
 config/rootfiles/packages/vdr_streamdev            |    2 +-
 config/rootfiles/packages/x86_64/amazon-ssm-agent  |    1 +
 config/rootfiles/packages/x86_64/vdr_dvbapi        |    2 +-
 config/suricata/ruleset-sources                    |    4 +-
 config/suricata/suricata.yaml                      |   28 +-
 config/udev/network-hotplug-bridges                |   10 +-
 doc/language_issues.de                             |    6 +-
 doc/language_issues.en                             |   20 +-
 doc/language_issues.es                             |   16 +-
 doc/language_issues.fr                             |   22 +-
 doc/language_issues.it                             |   15 +-
 doc/language_issues.nl                             |   14 +-
 doc/language_issues.pl                             |   16 +-
 doc/language_issues.ru                             |   16 +-
 doc/language_issues.tr                             |   15 +-
 doc/language_missings                              |  105 +-
 html/cgi-bin/connections.cgi                       |    7 +-
 html/cgi-bin/country.cgi                           |    5 +-
 html/cgi-bin/credits.cgi                           |    4 +-
 html/cgi-bin/dns.cgi                               |   30 +-
 html/cgi-bin/index.cgi                             |    1 +
 html/cgi-bin/ipinfo.cgi                            |  147 +-
 html/cgi-bin/location-block.cgi                    |    4 +-
 html/cgi-bin/logs.cgi/firewalllog.dat              |    6 +-
 html/cgi-bin/logs.cgi/firewalllogcountry.dat       |    5 +-
 html/cgi-bin/logs.cgi/firewalllogip.dat            |    6 +-
 html/cgi-bin/logs.cgi/showrequestfromcountry.dat   |    7 +-
 html/cgi-bin/ovpnmain.cgi                          |   34 +-
 html/cgi-bin/remote.cgi                            |   10 +-
 html/cgi-bin/tor.cgi                               |  124 +-
 html/cgi-bin/vpnmain.cgi                           |    1 +
 html/cgi-bin/wlanap.cgi                            |   44 +-
 html/cgi-bin/zoneconf.cgi                          |  124 +-
 html/html/include/zoneconf.js                      |   56 +
 langs/de/cgi-bin/de.pl                             |   18 +-
 langs/en/cgi-bin/en.pl                             |   20 +-
 langs/es/cgi-bin/es.pl                             |    2 +-
 langs/fr/cgi-bin/fr.pl                             |   20 +-
 langs/it/cgi-bin/it.pl                             |    3 +-
 langs/nl/cgi-bin/nl.pl                             |    4 +-
 langs/pl/cgi-bin/pl.pl                             |    4 +-
 langs/ru/cgi-bin/ru.pl                             |    4 +-
 langs/tr/cgi-bin/tr.pl                             |    3 +-
 lfs/amavisd                                        |   94 -
 lfs/amazon-ssm-agent                               |    7 +-
 lfs/apcupsd                                        |    4 +-
 lfs/aws-cli                                        |    8 +-
 lfs/bash                                           |    4 +-
 lfs/configroot                                     |    2 +-
 lfs/curl                                           |    4 +-
 lfs/ddns                                           |    2 +
 lfs/file                                           |    6 +-
 lfs/freeradius                                     |    4 +-
 lfs/{poppler => gdb}                               |   23 +-
 lfs/ghostscript                                    |    8 +-
 lfs/git                                            |    2 +-
 lfs/go                                             |    4 +-
 lfs/hostapd                                        |    2 +-
 lfs/intel-microcode                                |    4 +-
 lfs/knot                                           |    4 +-
 lfs/libloc                                         |    5 +-
 lfs/libseccomp                                     |    7 +-
 lfs/linux                                          |   11 +-
 lfs/logwatch                                       |    2 +
 lfs/lynis                                          |    6 +-
 lfs/ntp                                            |    7 +-
 lfs/openvpn                                        |    4 +-
 lfs/pcengines-apu-firmware                         |   21 +-
 lfs/perl-Net-LibIDN                                |   83 -
 lfs/python3-botocore                               |    6 +-
 lfs/{python3-six => python3-urllib3}               |   12 +-
 lfs/spamassassin                                   |   88 -
 lfs/spectre-meltdown-checker                       |    6 +-
 lfs/strongswan                                     |    4 +-
 lfs/suricata                                       |   10 +-
 lfs/tor                                            |    6 +-
 lfs/transmission                                   |    8 +-
 lfs/tzdata                                         |   12 +-
 lfs/usb_modeswitch                                 |    4 +-
 lfs/usb_modeswitch_data                            |    4 +-
 lfs/vdr                                            |   10 +-
 lfs/vdr_dvbapi                                     |    4 +-
 lfs/vdr_eepg                                       |    4 +-
 lfs/vdr_epgsearch                                  |    4 +-
 lfs/vdr_streamdev                                  |    4 +-
 make.sh                                            |    8 +-
 src/hwdata/pci.ids                                 |  618 +++-
 src/hwdata/usb.ids                                 | 3508 +++++++++++++++++-
 src/initscripts/packages/amavisd                   |   45 -
 src/initscripts/packages/spamassassin              |   45 -
 src/initscripts/system/network                     |    8 +
 src/initscripts/system/unbound                     |   69 +-
 src/patches/bash/bash50-012                        |   64 +
 src/patches/bash/bash50-013                        |   73 +
 src/patches/bash/bash50-014                        |   52 +
 src/patches/bash/bash50-015                        |   78 +
 src/patches/bash/bash50-016                        |   58 +
 src/patches/bash/bash50-017                        |  289 ++
 src/patches/bash/bash50-018                        |   45 +
 ...11-ddnss-fix-unhandled-exeption-on-update-patch |   30 +
 ...13-ddnss-fix-unhandled-exeption-on-update-patch |   30 +
 src/patches/ddns-013-duckdns-new-api.patch         |   83 +
 src/patches/libloc-0.9.4-upstream.patch            | 3850 ++++++++++++++++++++
 ...86_net_packet_fix_overflow_in_tpacket_rcv.patch |   44 -
 .../logwatch-7.5.4-dhcpd_reuse_lease_entries.patch |   15 +
 .../logwatch/logwatch-7.5.4-disable_iptables.patch |   14 +
 src/patches/vdr/vdr-2.4.1_replace_stime.patch      |   47 -
 tools/checknewlog.pl                               |    2 +-
 tools/checkrootfiles                               |    2 +-
 199 files changed, 13839 insertions(+), 2470 deletions(-)
 delete mode 100644 config/amavisd/amavisd.conf
 create mode 100644 config/backup/includes/apcupsd
 create mode 100644 config/ntp/ntp.conf
 create mode 100644 config/rootfiles/common/gdb
 rename config/rootfiles/core/{152 => 153}/exclude (100%)
 copy config/rootfiles/{oldcore/124 => core/153}/filelists/aarch64/linux (100%)
 copy config/rootfiles/{oldcore/124 => core/153}/filelists/aarch64/linux-initrd (100%)
 copy config/rootfiles/{oldcore/121 => core/153}/filelists/armv5tel/linux-initrd-multi (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/armv5tel/linux-multi (100%)
 copy config/rootfiles/{oldcore/139 => core/153}/filelists/bash (100%)
 copy config/rootfiles/{oldcore/104 => core/153}/filelists/curl (100%)
 copy config/rootfiles/{oldcore/104 => core/153}/filelists/ddns (100%)
 copy config/rootfiles/{oldcore/106 => core/153}/filelists/file (100%)
 copy config/rootfiles/{oldcore/148 => core/153}/filelists/files (53%)
 copy config/rootfiles/{oldcore/132 => core/153}/filelists/hwdata (100%)
 copy config/rootfiles/{oldcore/121 => core/153}/filelists/i586/intel-microcode (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/i586/linux (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/i586/linux-initrd (100%)
 copy config/rootfiles/{oldcore/131 => core/153}/filelists/ids-ruleset-sources (100%)
 copy config/rootfiles/core/{152 => 153}/filelists/knot (100%)
 copy config/rootfiles/{oldcore/104 => core/153}/filelists/libarchive (100%)
 copy config/rootfiles/core/{152 => 153}/filelists/libhtp (100%)
 rename config/rootfiles/core/{152 => 153}/filelists/libloc (100%)
 copy config/rootfiles/{oldcore/111 => core/153}/filelists/logwatch (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/openvpn (100%)
 copy config/rootfiles/{oldcore/106 => core/153}/filelists/strongswan (100%)
 copy config/rootfiles/core/{152 => 153}/filelists/suricata (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/tzdata (100%)
 copy config/rootfiles/{oldcore/106 => core/153}/filelists/usb_modeswitch (100%)
 copy config/rootfiles/{oldcore/106 => core/153}/filelists/usb_modeswitch_data (100%)
 copy config/rootfiles/{oldcore/121 => core/153}/filelists/x86_64/intel-microcode (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/x86_64/linux (100%)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/x86_64/linux-initrd (100%)
 copy config/rootfiles/{oldcore/150 => core/153}/update.sh (90%)
 copy config/rootfiles/oldcore/{149 => 152}/exclude (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/aarch64/python (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/aarch64/python3 (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/armv5tel/python (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/armv5tel/python3 (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/ca-certificates (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/files (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/i586/python (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/i586/python3 (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/knot (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/libhtp (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/setup (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/suricata (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/unbound (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/x86_64/python (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/x86_64/python3 (100%)
 rename config/rootfiles/{core => oldcore}/152/filelists/yaml (100%)
 rename config/rootfiles/{core => oldcore}/152/update.sh (100%)
 delete mode 100644 config/rootfiles/packages/amavisd
 create mode 100644 config/rootfiles/packages/python3-urllib3
 delete mode 100644 config/rootfiles/packages/spamassassin
 create mode 100644 html/html/include/zoneconf.js
 delete mode 100644 lfs/amavisd
 copy lfs/{poppler => gdb} (91%)
 delete mode 100644 lfs/perl-Net-LibIDN
 copy lfs/{python3-six => python3-urllib3} (95%)
 delete mode 100644 lfs/spamassassin
 delete mode 100644 src/initscripts/packages/amavisd
 delete mode 100644 src/initscripts/packages/spamassassin
 create mode 100644 src/patches/bash/bash50-012
 create mode 100644 src/patches/bash/bash50-013
 create mode 100644 src/patches/bash/bash50-014
 create mode 100644 src/patches/bash/bash50-015
 create mode 100644 src/patches/bash/bash50-016
 create mode 100644 src/patches/bash/bash50-017
 create mode 100644 src/patches/bash/bash50-018
 create mode 100644 src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch
 create mode 100644 src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
 create mode 100644 src/patches/ddns-013-duckdns-new-api.patch
 create mode 100644 src/patches/libloc-0.9.4-upstream.patch
 delete mode 100644 src/patches/linux/linux-4.14_cve-2020-14386_net_packet_fix_overflow_in_tpacket_rcv.patch
 create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
 create mode 100644 src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
 delete mode 100644 src/patches/vdr/vdr-2.4.1_replace_stime.patch
Difference in files:

diff --git a/config/amavisd/amavisd.conf b/config/amavisd/amavisd.conf
deleted file mode 100644
index 25b4d2682..000000000
--- a/config/amavisd/amavisd.conf
+++ /dev/null
@@ -1,438 +0,0 @@
-use strict;
-
-# a minimalistic configuration file for amavisd-new with all necessary settings
-#
-#   see amavisd.conf-default for a list of all variables with their defaults;
-#   see amavisd.conf-sample for a traditional-style commented file;
-#   for more details see documentation in INSTALL, README_FILES/*
-#   and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html
-
-
-# COMMONLY ADJUSTED SETTINGS:
-
-# @bypass_virus_checks_maps = (1);  # controls running of anti-virus code
-# @bypass_spam_checks_maps  = (1);  # controls running of anti-spam code
-# $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
-
-$max_servers = 2;            # num of pre-forked children (2..15 is common), -m
-$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis), -u
-$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis), -g
-
-$mydomain = 'ipfire.org';   # a convenient default for other settings
-
-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
-$TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
-$ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR, used by SA, etc.
-$QUARANTINEDIR = '/var/virusmails';  # -Q
-# $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
-
-# $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
-
-# $db_home   = "$MYHOME/db";      # dir for bdb nanny/cache/snmp databases, -D
-# $helpers_home = "$MYHOME/var";  # working directory for SpamAssassin, -S
-# $lock_file = "$MYHOME/var/amavisd.lock";  # -L
-# $pid_file  = "$MYHOME/var/amavisd.pid";   # -P
-#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
-
-$log_level = 2;              # verbosity 0..5, -d
-$log_recip_templ = undef;    # disable by-recipient level-0 log entries
-$DO_SYSLOG = 1;              # log via syslogd (preferred)
-$syslog_facility = 'mail';   # Syslog facility as a string
-           # e.g.: mail, daemon, user, local0, ... local7
-$syslog_priority = 'debug';  # Syslog base (minimal) priority as a string,
-           # choose from: emerg, alert, crit, err, warning, notice, info, debug
-
-$enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
-$enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
-$nanny_details_level = 2;    # nanny verbosity: 1: traditional, 2: detailed
-
-@local_domains_maps = ( [".$mydomain"] );  # list of all local domains
-
-@mynetworks = qw( 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
-
-$unix_socketname = "$MYHOME/amavisd.sock";  # amavisd-release or amavis-milter
-               # option(s) -p overrides $inet_socket_port and $unix_socketname
-
-$inet_socket_port = 10024;   # listen on this local TCP port(s)
-# $inet_socket_port = [10024,10026];  # listen on multiple TCP ports
-
-$policy_bank{'MYNETS'} = {   # mail originating from @mynetworks
-  originating => 1,  # is true in MYNETS by default, but let's make it explicit
-  os_fingerprint_method => undef,  # don't query p0f for internal clients
-};
-
-# it is up to MTA to re-route mail from authenticated roaming users or
-# from internal hosts to a dedicated TCP port (such as 10026) for filtering
-$interface_policy{'10026'} = 'ORIGINATING';
-
-$policy_bank{'ORIGINATING'} = {  # mail supposedly originating from our users
-  originating => 1,  # declare that mail was submitted by our smtp client
-  allow_disclaimers => 1,  # enables disclaimer insertion if available
-  # notify administrator of locally originating malware
-  virus_admin_maps => ["virusalert@$mydomain"],
-  spam_admin_maps  => ["spamalert@$mydomain"],
-  warnbadhsender   => 1,
-  # forward to a smtpd service providing DKIM signing service
-  forward_method => 'smtp:[127.0.0.1]:10027',
-  # force MTA conversion to 7-bit (e.g. before DKIM signing)
-  smtpd_discard_ehlo_keywords => ['8BITMIME'],
-  bypass_banned_checks_maps => [1],  # allow sending any file names and types
-  terminate_dsn_on_notify_success => 0,  # don't remove NOTIFY=SUCCESS option 
-};
-
-$interface_policy{'SOCK'} = 'AM.PDP-SOCK'; # only applies with $unix_socketname
-
-# Use with amavis-release over a socket or with Petr Rehor's amavis-milter.c
-# (with amavis-milter.c from this package or old amavis.c client use 'AM.CL'):
-$policy_bank{'AM.PDP-SOCK'} = {
-  protocol => 'AM.PDP',
-  auth_required_release => 0,  # do not require secret_id for amavisd-release
-};
-
-$sa_tag_level_deflt  = 2.0;  # add spam info headers if at, or above that level
-$sa_tag2_level_deflt = 6.2;  # add 'spam detected' headers at that level
-$sa_kill_level_deflt = 6.9;  # triggers spam evasive actions (e.g. blocks mail)
-$sa_dsn_cutoff_level = 10;   # spam level beyond which a DSN is not sent
-# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off
-$penpals_bonus_score = 8;    # (no effect without a @storage_sql_dsn database)
-$penpals_threshold_high = $sa_kill_level_deflt;  # don't waste time on hi spam
-
-$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger
-$sa_local_tests_only = 0;    # only tests which do not require internet access?
-
-$virus_admin               = "virusalert@$mydomain";  # notifications recip.
-
-$mailfrom_notify_admin     = "virusalert@$mydomain";  # notifications sender
-$mailfrom_notify_recip     = "virusalert@$mydomain";  # notifications sender
-$mailfrom_notify_spamadmin = "spam.police@$mydomain"; # notifications sender
-$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
-
-@addr_extension_virus_maps      = ('virus');
-@addr_extension_banned_maps     = ('banned');
-@addr_extension_spam_maps       = ('spam');
-@addr_extension_bad_header_maps = ('badh');
-# $recipient_delimiter = '+';  # undef disables address extensions altogether
-# when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
-
-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
-# $dspam = 'dspam';
-
-$MAXLEVELS = 14;
-$MAXFILES = 1500;
-$MIN_EXPANSION_QUOTA =      100*1024;  # bytes  (default undef, not enforced)
-$MAX_EXPANSION_QUOTA = 300*1024*1024;  # bytes  (default undef, not enforced)
-
-$sa_spam_subject_tag = '***SPAM*** ';
-$defang_virus  = 1;  # MIME-wrap passed infected mail
-$defang_banned = 1;  # MIME-wrap passed mail containing banned name
-# for defanging bad headers only turn on certain minor contents categories:
-$defang_by_ccat{+CC_BADH.",3"} = 1;  # NUL or CR character in header
-$defang_by_ccat{+CC_BADH.",5"} = 1;  # header line longer than 998 characters
-$defang_by_ccat{+CC_BADH.",6"} = 1;  # header field syntax error
-
-
-# OTHER MORE COMMON SETTINGS (defaults may suffice):
-
-$myhostname = 'ipfire.localdomain';  # must be a fully-qualified domain name!
-
-# $notify_method  = 'smtp:[127.0.0.1]:10025';
-# $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
-
-$final_virus_destiny      = D_DISCARD;
-$final_banned_destiny     = D_BOUNCE;
-$final_spam_destiny       = D_DISCARD;
-$final_bad_header_destiny = D_PASS;
-
-
-# Notify virus sender?  Bloß nicht!
-$warnvirussender = 0; 
-# Notify spam sender?   Bloß nicht!
-$warnspamsender = 0;  
-# Notify sender of banned files?  Kann man machen.
-$warnbannedsender = 1;
-# Notify sender of syntactically invalid header containing non-ASCII characters? Bloß nicht!
-#$warnbadsender = 0;
-# Notify virus (or banned files) RECIPIENT? Wie man möchte, ich finde es sinnvoll.
-$warnvirusrecip = 1;
-$warnbannedrecip = 1;
-$warnbadhrecip = 1;
-
-# SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all)
-
-# $warnbadhsender,
-# $warnvirusrecip, $warnbannedrecip, $warnbadhrecip, (or @warn*recip_maps)
-#
-# @bypass_virus_checks_maps, @bypass_spam_checks_maps,
-# @bypass_banned_checks_maps, @bypass_header_checks_maps,
-#
-# @virus_lovers_maps, @spam_lovers_maps,
-# @banned_files_lovers_maps, @bad_header_lovers_maps,
-#
-# @blacklist_sender_maps, @score_sender_maps,
-#
-# $clean_quarantine_method, $virus_quarantine_to, $banned_quarantine_to,
-# $bad_header_quarantine_to, $spam_quarantine_to,
-#
-# $defang_bad_header, $defang_undecipherable, $defang_spam
-
-
-# REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS
-
-@keep_decoded_original_maps = (new_RE(
-# qr'^MAIL$',   # retain full original message for virus checking (can be slow)
-  qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables
-  qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i,
-# qr'^Zip archive data',     # don't trust Archive::Zip
-));
-
-
-# for $banned_namepath_re (a new-style of banned table) see amavisd.conf-sample
-
-$banned_filename_re = new_RE(
-
-### BLOCKED ANYWHERE
-# qr'^UNDECIPHERABLE$',  # is or contains any undecipherable components
-  qr'^.(exe-ms|dll)$',                   # banned file(1) types, rudimentary
-# qr'^.(exe|lha|tnef|cab|dll)$',         # banned file(1) types
-
-### BLOCK THE FOLLOWING, EXCEPT WITHIN UNIX ARCHIVES:
-# [ qr'^.(gz|bz2)$'             => 0 ],  # allow any in gzip or bzip2
-  [ qr'^.(rpm|cpio|tar)$'       => 0 ],  # allow any in Unix-type archives
-
-  qr'..(pif|scr)$'i,                     # banned extensions - rudimentary
-# qr'^.zip$',                            # block zip type
-
-### BLOCK THE FOLLOWING, EXCEPT WITHIN ARCHIVES:
-# [ qr'^.(zip|rar|arc|arj|zoo)$'=> 0 ],  # allow any within these archives
-
-  qr'^application/x-msdownload$'i,        # block these MIME types
-  qr'^application/x-msdos-program$'i,
-  qr'^application/hta$'i,
-
-# qr'^message/partial$'i,         # rfc2046 MIME type
-# qr'^message/external-body$'i,   # rfc2046 MIME type
-
-# qr'^(application/x-msmetafile|image/x-wmf)$'i,  # Windows Metafile MIME type
-# qr'^.wmf$',                            # Windows Metafile file(1) type
-
-  # block certain double extensions in filenames
-  qr'.[^./]*[A-Za-z][^./]*.\s*(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)[.\s]*$'i,
-
-# qr'{[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}}?'i, # Class ID CLSID, strict
-# qr'{[0-9a-z]{4,}(-[0-9a-z]{4,}){0,7}}?'i, # Class ID extension CLSID, loose
-
-  qr'..(exe|vbs|pif|scr|cpl)$'i,             # banned extension - basic
-# qr'..(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd
-# qr'..(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta|
-#        inf|ins|isp|js|jse|lnk|mda|mdb|mde|mdw|mdt|mdz|msc|msi|msp|mst|
-#        ops|pcd|pif|prg|reg|scr|sct|shb|shs|vb|vbe|vbs|
-#        wmf|wsc|wsf|wsh)$'ix,  # banned ext - long
-# qr'..(ani|cur|ico)$'i,                 # banned cursors and icons filename
-# qr'^.ani$',                            # banned animated cursor file(1) type
-
-# qr'..(mim|b64|bhx|hqx|xxe|uu|uue)$'i,  # banned extension - WinZip vulnerab.
-);
-# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631
-# and http://www.cknow.com/vtutor/vtextensions.htm
-
-
-# ENVELOPE SENDER SOFT-WHITELISTING / SOFT-BLACKLISTING
-
-@score_sender_maps = ({ # a by-recipient hash lookup table,
-                        # results from all matching recipient tables are summed
-
-# ## per-recipient personal tables  (NOTE: positive: black, negative: white)
-# 'user1@example.com'  => [{'bla-mobile.press@example.com' => 10.0}],
-# 'user3@example.com'  => [{'.ebay.com'                 => -3.0}],
-# 'user4@example.com'  => [{'cleargreen@cleargreen.com' => -7.0,
-#                           '.cleargreen.com'           => -5.0}],
-
-  ## site-wide opinions about senders (the '.' matches any recipient)
-  '.' => [  # the _first_ matching sender determines the score boost
-
-   new_RE(  # regexp-type lookup table, just happens to be all soft-blacklist
-    [qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou)@'i         => 5.0],
-    [qr'^(greatcasino|investments|lose_weight_today|market.alert)@'i=> 5.0],
-    [qr'^(money2you|MyGreenCard|new.tld.registry|opt-out|opt-in)@'i=> 5.0],
-    [qr'^(optin|saveonlsmoking2002k|specialoffer|specialoffers)@'i   => 5.0],
-    [qr'^(stockalert|stopsnoring|wantsome|workathome|yesitsfree)@'i  => 5.0],
-    [qr'^(your_friend|greatoffers)@'i                                => 5.0],
-    [qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i                    => 5.0],
-   ),
-
-#  read_hash("/var/amavis/sender_scores_sitewide"),
-
-   { # a hash-type lookup table (associative array)
-     'nobody@cert.org'                        => -3.0,
-     'cert-advisory@us-cert.gov'              => -3.0,
-     'owner-alert@iss.net'                    => -3.0,
-     'slashdot@slashdot.org'                  => -3.0,
-     'securityfocus.com'                      => -3.0,
-     'ntbugtraq@listserv.ntbugtraq.com'       => -3.0,
-     'security-alerts@linuxsecurity.com'      => -3.0,
-     'mailman-announce-admin@python.org'      => -3.0,
-     'amavis-user-admin@lists.sourceforge.net'=> -3.0,
-     'amavis-user-bounces@lists.sourceforge.net' => -3.0,
-     'spamassassin.apache.org'                => -3.0,
-     'notification-return@lists.sophos.com'   => -3.0,
-     'owner-postfix-users@postfix.org'        => -3.0,
-     'owner-postfix-announce@postfix.org'     => -3.0,
-     'owner-sendmail-announce@lists.sendmail.org'   => -3.0,
-     'sendmail-announce-request@lists.sendmail.org' => -3.0,
-     'donotreply@sendmail.org'                => -3.0,
-     'ca+envelope@sendmail.org'               => -3.0,
-     'noreply@freshmeat.net'                  => -3.0,
-     'owner-technews@postel.acm.org'          => -3.0,
-     'ietf-123-owner@loki.ietf.org'           => -3.0,
-     'cvs-commits-list-admin@gnome.org'       => -3.0,
-     'rt-users-admin@lists.fsck.com'          => -3.0,
-     'clp-request@comp.nus.edu.sg'            => -3.0,
-     'surveys-errors@lists.nua.ie'            => -3.0,
-     'emailnews@genomeweb.com'                => -5.0,
-     'yahoo-dev-null@yahoo-inc.com'           => -3.0,
-     'returns.groups.yahoo.com'               => -3.0,
-     'clusternews@linuxnetworx.com'           => -3.0,
-     lc('lvs-users-admin@LinuxVirtualServer.org')    => -3.0,
-     lc('owner-textbreakingnews@CNNIMAIL12.CNN.COM') => -5.0,
-
-     # soft-blacklisting (positive score)
-     'sender@example.net'                     =>  3.0,
-     '.example.net'                           =>  1.0,
-
-   },
-  ],  # end of site-wide tables
-});
-
-
-@decoders = (
-  ['mail', &do_mime_decode],
-  ['asc',  &do_ascii],
-  ['uue',  &do_ascii],
-  ['hqx',  &do_ascii],
-  ['ync',  &do_ascii],
-  ['F',    &do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
-  ['Z',    &do_uncompress, ['uncompress','gzip -d','zcat'] ],
-  ['gz',   &do_uncompress,  'gzip -d'],
-  ['gz',   &do_gunzip],
-  ['bz2',  &do_uncompress,  'bzip2 -d'],
-  ['lzo',  &do_uncompress,  'lzop -d'],
-  ['rpm',  &do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ],
-  ['cpio', &do_pax_cpio,   ['pax','gcpio','cpio'] ],
-  ['tar',  &do_pax_cpio,   ['pax','gcpio','cpio'] ],
-  ['deb',  &do_ar,          'ar'],
-# ['a',    &do_ar,          'ar'],  # unpacking .a seems an overkill
-  ['zip',  &do_unzip],
-  ['7z',   &do_7zip,       ['7zr','7za','7z'] ],
-  ['rar',  &do_unrar,      ['rar','unrar'] ],
-  ['arj',  &do_unarj,      ['arj','unarj'] ],
-  ['arc',  &do_arc,        ['nomarch','arc'] ],
-  ['zoo',  &do_zoo,        ['zoo','unzoo'] ],
-  ['lha',  &do_lha,         'lha'],
-# ['doc',  &do_ole,         'ripole'],
-  ['cab',  &do_cabextract,  'cabextract'],
-  ['tnef', &do_tnef_ext,    'tnef'],
-  ['tnef', &do_tnef],
-# ['sit',  &do_unstuff,     'unstuff'],  # broken/unsafe decoder
-  ['exe',  &do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ],
-);
-
-
-@av_scanners = (
-
-#	### http://www.clamav.net/
-	['ClamAV-clamd',
-  &ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd"],
-	qr/\bOK$/, qr/\bFOUND$/,
-	 qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-#	# NOTE: run clamd under the same user as amavisd, or run it under its own
-#	#   uid such as clamav, add user clamav to the amavis group, and then add
-#	#   AllowSupplementaryGroups to clamd.conf;
-#	# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
-#	#   this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
-
-# ### http://www.f-prot.com/
-# ['FRISK F-Prot Daemon',
-#   &ask_daemon,
-#   ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n",
-#     ['127.0.0.1:10200','127.0.0.1:10201','127.0.0.1:10202',
-#      '127.0.0.1:10203','127.0.0.1:10204'] ],
-#   qr/(?i)<summary[^>]*>clean</summary>/,
-#   qr/(?i)<summary[^>]*>infected</summary>/,
-#   qr/(?i)<name>(.+)</name>/ ],
-
-  ### http://www.kaspersky.com/  (kav4mailservers)
-  ['KasperskyLab AVP - aveclient',
-    ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient',
-     '/opt/kav/5.5/kav4mailservers/bin/aveclient','aveclient'],
-    '-p /var/run/aveserver -s {}/*',
-    [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/,
-    qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/,
-  ],
-  # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious,
-  # currupted or protected archives are to be handled
-
-  ### http://www.avira.com/
-  ### Avira AntiVir (formerly H+BEDV) or (old) CentralCommand Vexira Antivirus
-  ['Avira AntiVir', ['antivir','vexira'],
-    '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/,
-    qr/(?x)^\s* (?: ALERT: \s* (?: [ | [^']* ' ) |
-         (?i) VIRUS:\ .*?\ virus\ '?) ( [^]\s']+ )/ ],
-    # NOTE: if you only have a demo version, remove -z and add 214, as in:
-    #  '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/,
-
-# ### http://www.avast.com/
-# ['avast! Antivirus daemon',
-#   &ask_daemon,	# greets with 220, terminate with QUIT
-#   ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'],
-#   qr/\t[+]/, qr/\t[L]\t/, qr/\t[L]\t([^[ \t\015\012]+)/ ],
-
-# ### http://www.avast.com/
-# ['avast! Antivirus - Client/Server Version', 'avastlite',
-#   '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1],
-#   qr/\t[L]\t([^[ \t\015\012]+)/ ],
-
-  ### http://www.avast.com/
-  ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
-    '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n[]]+)/ ],
-
-  ### http://www.bitdefender.com/
-  ['BitDefender', 'bdc',
-    '--arc --mail {}', qr/^Infected files *:0+(?!\d)/,
-    qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/,
-    qr/(?:suspected|infected): (.*)(?:\033|$)/ ],
-  # consider also: --all --nowarn --alev=15 --flev=15.  The --all argument may
-  # not apply to your version of bdc, check documentation and see 'bdc --help'
-
-);
-
-
-@av_scanners_backup = (
-
-  ### http://www.clamav.net/   - backs up clamd or Mail::ClamAV
-  ['ClamAV-clamscan', 'clamscan',
-    "--stdout --no-summary -r --tempdir=$TEMPBASE {}",
-    [0], qr/:.*\sFOUND$/, qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-
-  ### http://www.f-prot.com/   - backs up F-Prot Daemon
-  ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
-    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
-    qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/ ],
-
-   ### http://www.kaspersky.com/
-   ['Kaspersky Antivirus v5.5',
-     ['/opt/kaspersky/kav4fs/bin/kav4fs-kavscanner',
-      '/opt/kav/5.5/kav4unix/bin/kavscanner',
-      '/opt/kav/5.5/kav4mailservers/bin/kavscanner', 'kavscanner'],
-     '-i0 -xn -xp -mn -R -ePASBME {}/*', [0,10,15], [5,20,21,25],
-     qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.*)/ ,
-#    sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"},
-#    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
-   ],
-
-# always succeeds (uncomment to consider mail clean if all other scanners fail)
-# ['always-clean', sub {0}],
-
-);
-
-
-1;  # insure a defined return
diff --git a/config/backup/includes/apcupsd b/config/backup/includes/apcupsd
new file mode 100644
index 000000000..82dcd84ed
--- /dev/null
+++ b/config/backup/includes/apcupsd
@@ -0,0 +1 @@
+/etc/apcupsd/
diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl
index 2cfe7f908..fb97eb589 100644
--- a/config/cfgroot/location-functions.pl
+++ b/config/cfgroot/location-functions.pl
@@ -1,25 +1,23 @@
 #!/usr/bin/perl -w
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire is free software; you can redistribute it and/or modify           #
-# it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire is distributed in the hope that it will be useful,                #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# GNU General Public License for more details.                             #
-#                                                                          #
-# You should have received a copy of the GNU General Public License        #
-# along with IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2015 - 2020 IPFire Team info@ipfire.org.                 #
-#                                                                          #
-############################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
package Location::Functions;
@@ -55,6 +53,9 @@ our $keyfile = "$location_dir/signing-key.pem";
 # Directory which contains the exported databases.
 our $xt_geoip_db_directory = "/usr/share/xt_geoip/";
+# Create libloc database handle.
+my $db_handle = &init();
+
 #
 ## Tiny function to init the location database.
 #
@@ -83,10 +84,10 @@ sub verify ($) {
 }
#
-## Function to the the country code of a given address.
+## Function to get the country code of a given address.
 #
 sub lookup_country_code($$) {
-	my ($db_handle, $address) = @_;
+	my ($address) = @_;
# Lookup the given address.
    my $country_code = &Location::lookup_country_code($db_handle, $address);
@@ -162,9 +163,6 @@ sub get_full_country_name($) {
    	# Grab location name from hash.
    	$name = $not_iso_3166_location{$code};
    } else {
-		# Init libloc database connection.
-		my $db_handle = &init();
-
    	# Get the country name by using the location module.
    	$name = &Location::get_country_name($db_handle, $code);
    }
@@ -174,22 +172,37 @@ sub get_full_country_name($) {
# Function to get all available locations.
 sub get_locations() {
-	# Create libloc database handle.
-	my $db_handle = &init();
+	my ($mode) = @_;
+
+	# Set default mode to add_special_locations.
+	$mode = $mode ? $mode : "add_special_locations";
# Get locations which are stored in the location database.
-	my @database_locations = &Location::database_countries($db_handle);
+	my @locations = &Location::database_countries($db_handle);
-	# Merge special locations array and the database locations array.
-	my @locations = (@special_locations, @database_locations);
+	# Check if the special locations should be added.
+	if ($mode ne "no_special_locations") {
+		# Merge special locations array and the database locations array.
+		@locations = (@special_locations, @locations);
+	}
# Sort locations array in alphabetical order.
    my @sorted_locations = sort(@locations);
-	# Return the array..
+	# Return the array.
    return @sorted_locations;
 }
+# Function to get the continent code of a given country code.
+sub get_continent_code($) {
+	my ($country_code) = @_;
+
+	# Use location module to grab the continent code.
+	my $continent_code = &Location::get_continent_code($db_handle, $country_code);
+
+	return $continent_code;
+}
+
 # Function to check if a given address has one ore more special flags.
 sub address_has_flags($) {
    my ($address) = @_;
@@ -197,9 +210,6 @@ sub address_has_flags($) {
    # Array to store the flags of the address.
    my @flags;
-	# Init libloc database handle.
-	my $db_handle = &init();
-
    # Loop through the hash of possible network flags.
    foreach my $flag (keys(%network_flags)) {
    	# Check if the address has the current flag.
@@ -221,4 +231,40 @@ sub address_has_flags($) {
    return @flags;
 }
+#
+## Function to get the Autonomous System Number of a given address.
+#
+sub lookup_asn($) {
+	my ($address) = @_;
+
+	# Lookup the given address.
+	my $asn = &Location::lookup_asn($db_handle, $address);
+
+	# Return the number of the Autonomous System
+	return $asn;
+}
+
+#
+## Function to get the name of an Autonomous System.
+#
+sub get_as_name($) {
+	my ($asn) = @_;
+
+	# Fetch the name of this AS...
+	my $as_name = &Location::get_as_name($db_handle, $asn);
+
+	# Return the name of the Autonomous System
+	return $as_name;
+}
+
+# Custom END declaration which will be executed when perl
+# ends, to release the database handle to libloc.
+END {
+	# Check if a database handle exists.
+	if ($db_handle) {
+		# Destroy libloc database handle.
+		&Location::DESTROY($db_handle);
+	}
+}
+
 1;
diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index be7c07c85..c9b4c092a 100644
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -103,3 +103,6 @@ net.ipv4.tcp_fastopen = 3
 # This protects against various TCP attacks, such as DoS against or injection
 # of arbitrary segments into prematurely closed connections.
 net.ipv4.tcp_rfc1337 = 1
+
+# Include PID in file names of generated core dumps
+kernel.core_uses_pid = 1
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index c2641a92d..bc6187052 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -628,8 +628,11 @@ sub locationblock {
    	return;
    }
-	# Only check the RED interface
-	if ($defaultNetworks{'RED_DEV'} ne "") {
+	# Only check the RED interface, which is ppp0 in case of RED_TYPE being
+	# set to "PPPOE", and red0 in case of RED_TYPE not being empty otherwise.
+	if ($defaultNetworks{'RED_TYPE'} eq "PPPOE") {
+		run("$IPTABLES -A LOCATIONBLOCK ! -i ppp0 -j RETURN");
+	} elsif ($defaultNetworks{'RED_DEV'} ne "") {
    	run("$IPTABLES -A LOCATIONBLOCK ! -i $defaultNetworks{'RED_DEV'} -j RETURN");
    }
diff --git a/config/hostapd/config b/config/hostapd/config
index 66ebbf1ce..78206ed78 100644
--- a/config/hostapd/config
+++ b/config/hostapd/config
@@ -15,22 +15,31 @@ CONFIG_DRIVER_HOSTAP=y
 # Driver interface for wired authenticator
 #CONFIG_DRIVER_WIRED=y
-# Driver interface for Prism54 driver
-CONFIG_DRIVER_PRISM54=y
-
 # Driver interface for drivers using the nl80211 kernel interface
 CONFIG_DRIVER_NL80211=y
-# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
-# shipped with your distribution yet. If that is the case, you need to build
-# newer libnl version and point the hostapd build to use it.
-#LIBNL=/usr/src/libnl
-#CFLAGS += -I$(LIBNL)/include
-#LIBS += -L$(LIBNL)/lib
+
+# QCA vendor extensions to nl80211
+#CONFIG_DRIVER_NL80211_QCA=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
+CONFIG_LIBNL32=y
+
# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
 #CFLAGS += -I/usr/local/include
 #LIBS += -L/usr/local/lib
+#LIBS_p += -L/usr/local/lib
+#LIBS_c += -L/usr/local/lib
# Driver interface for no driver (e.g., RADIUS server only)
 #CONFIG_DRIVER_NONE=y
@@ -41,12 +50,12 @@ CONFIG_IAPP=y
 # WPA2/IEEE 802.11i RSN pre-authentication
 CONFIG_RSN_PREAUTH=y
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
 # IEEE 802.11w (management frame protection)
 CONFIG_IEEE80211W=y
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Integrated EAP server
 CONFIG_EAP=y
@@ -99,24 +108,30 @@ CONFIG_EAP_TTLS=y
 #CONFIG_EAP_GPSK_SHA256=y
# EAP-FAST for the integrated EAP server
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
-# to add the needed functions.
 #CONFIG_EAP_FAST=y
+# EAP-TEAP for the integrated EAP server
+# Note: The current EAP-TEAP implementation is experimental and should not be
+# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
+# of conflicting statements and missing details and the implementation has
+# vendor specific workarounds for those and as such, may not interoperate with
+# any other implementation. This should not be used for anything else than
+# experimentation and interoperability testing until those issues has been
+# resolved.
+#CONFIG_EAP_TEAP=y
+
 # Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
+#CONFIG_WPS=y
 # Enable UPnP support for external WPS Registrars
-CONFIG_WPS_UPNP=y
+#CONFIG_WPS_UPNP=y
 # Enable WPS support with NFC config method
 #CONFIG_WPS_NFC=y
# EAP-IKEv2
-CONFIG_EAP_IKEV2=y
+#CONFIG_EAP_IKEV2=y
# Trusted Network Connect (EAP-TNC)
-CONFIG_EAP_TNC=y
+#CONFIG_EAP_TNC=y
# EAP-EKE for the integrated EAP server
 #CONFIG_EAP_EKE=y
@@ -133,10 +148,10 @@ CONFIG_PKCS12=y
 #CONFIG_IPV6=y
# IEEE Std 802.11r-2008 (Fast BSS Transition)
-CONFIG_IEEE80211R=y
+#CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without
-# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
+# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
 #CONFIG_DRIVER_RADIUS_ACL=y
# IEEE 802.11n (High Throughput) support
@@ -149,6 +164,12 @@ CONFIG_IEEE80211N=y
 # IEEE 802.11ac (Very High Throughput) support
 CONFIG_IEEE80211AC=y
+# IEEE 802.11ax HE support
+# Note: This is experimental and work in progress. The definitions are still
+# subject to change and this should not be expected to interoperate with the
+# final IEEE 802.11ax version.
+#CONFIG_IEEE80211AX=y
+
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
@@ -158,6 +179,9 @@ CONFIG_IEEE80211AC=y
 # Disabled by default.
 #CONFIG_DEBUG_FILE=y
+# Send debug messages to syslog instead of stdout
+#CONFIG_DEBUG_SYSLOG=y
+
 # Add support for sending all debug messages (regardless of debug verbosity)
 # to the Linux kernel tracing facility. This helps debug the entire stack by
 # making it easy to record everything happening from the driver up into the
@@ -235,10 +259,25 @@ CONFIG_IEEE80211AC=y
 # requirements described above.
 #CONFIG_NO_RANDOM_POOL=y
+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+CONFIG_GETRANDOM=y
+
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+CONFIG_ELOOP_EPOLL=y
+
+# Should we use kqueue instead of select? Select is used by default.
+#CONFIG_ELOOP_KQUEUE=y
+
 # Select TLS implementation
 # openssl = OpenSSL (default)
 # gnutls = GnuTLS
 # internal = Internal TLSv1 implementation (experimental)
+# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
 # none = Empty template
 #CONFIG_TLS=openssl
@@ -251,6 +290,10 @@ CONFIG_IEEE80211AC=y
 # can be enabled to enable use of stronger crypto algorithms.
 #CONFIG_TLSV12=y
+# Select which ciphers to use by default with OpenSSL if the user does not
+# specify them.
+#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW"
+
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
 # LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -278,6 +321,12 @@ CONFIG_IEEE80211AC=y
 # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
 #CONFIG_SQLITE=y
+# Enable Fast Session Transfer (FST)
+#CONFIG_FST=y
+
+# Enable CLI commands for FST testing
+#CONFIG_FST_TEST=y
+
 # Testing options
 # This can be used to enable some testing options (see also the example
 # configuration file) that are really useful only for testing clients that
@@ -309,3 +358,37 @@ CONFIG_IEEE80211AC=y
 # http://wireless.kernel.org/en/users/Documentation/acs
 #
 CONFIG_ACS=y
+
+# Multiband Operation support
+# These extentions facilitate efficient use of multiple frequency bands
+# available to the AP and the devices that may associate with it.
+#CONFIG_MBO=y
+
+# Client Taxonomy
+# Has the AP retain the Probe Request and (Re)Association Request frames from
+# a client, from which a signature can be produced which can identify the model
+# of client device like "Nexus 6P" or "iPhone 5s".
+CONFIG_TAXONOMY=y
+
+# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
+#CONFIG_FILS=y
+# FILS shared key authentication with PFS
+#CONFIG_FILS_SK_PFS=y
+
+# Include internal line edit mode in hostapd_cli. This can be used to provide
+# limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y
+
+# Airtime policy support
+CONFIG_AIRTIME_POLICY=y
+
+# Override default value for the wpa_disable_eapol_key_retries configuration
+# parameter. See that parameter in hostapd.conf for more details.
+#CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
+
+# Custom configuration
+CONFIG_SAE=y
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 2d4934a09..b794cbcf2 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.198-ipfire Kernel Configuration
+# Linux/arm64 4.14.206-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1819,7 +1819,7 @@ CONFIG_SATA_PMP=y
 #
 # Controllers with non-SFF native interface
 #
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
@@ -5577,6 +5577,8 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_ACPI=y
 CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index d6831aaf0..3c26a3ce2 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.195-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.206-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 6f3a9cb53..8cac7cd45 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.195-ipfire Kernel Configuration
+# Linux/x86 4.14.206-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -4648,7 +4648,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 5ee87722d..4dec50605 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.195-ipfire Kernel Configuration
+# Linux/x86 4.14.206-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -4530,7 +4530,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
diff --git a/config/ntp/ntp.conf b/config/ntp/ntp.conf
new file mode 100644
index 000000000..9e393ca8e
--- /dev/null
+++ b/config/ntp/ntp.conf
@@ -0,0 +1,6 @@
+disable monitor
+restrict default nomodify noquery
+restrict 127.0.0.1
+server  127.127.1.0 prefer
+fudge   127.127.1.0 stratum 10
+driftfile /etc/ntp/drift
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 6f76519d0..7ffc70468 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -7072,6 +7072,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/dw
 #lib/modules/KVER-ipfire/build/include/config/dw/apb
 #lib/modules/KVER-ipfire/build/include/config/dw/apb/ictl.h
+#lib/modules/KVER-ipfire/build/include/config/dw/apb/timer
+#lib/modules/KVER-ipfire/build/include/config/dw/apb/timer.h
+#lib/modules/KVER-ipfire/build/include/config/dw/apb/timer/of.h
 #lib/modules/KVER-ipfire/build/include/config/dw/dmac
 #lib/modules/KVER-ipfire/build/include/config/dw/dmac/core.h
 #lib/modules/KVER-ipfire/build/include/config/dw/dmac/pci.h
@@ -9617,6 +9620,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/s2io.h
 #lib/modules/KVER-ipfire/build/include/config/sata
 #lib/modules/KVER-ipfire/build/include/config/sata/ahci
+#lib/modules/KVER-ipfire/build/include/config/sata/ahci.h
 #lib/modules/KVER-ipfire/build/include/config/sata/ahci/platform.h
 #lib/modules/KVER-ipfire/build/include/config/sata/dwc.h
 #lib/modules/KVER-ipfire/build/include/config/sata/mv.h
@@ -17306,7 +17310,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_platform.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_qoriq.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_sunxi.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/ata/libahci.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/libahci_platform.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_dwc_460ex.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_mv.ko.xz
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index 68926a0bb..f4240065e 100644
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -6,6 +6,7 @@ usr/bin/curl
 #usr/include/curl/easy.h
 #usr/include/curl/mprintf.h
 #usr/include/curl/multi.h
+#usr/include/curl/options.h
 #usr/include/curl/stdcheaders.h
 #usr/include/curl/system.h
 #usr/include/curl/typecheck-gcc.h
@@ -13,7 +14,7 @@ usr/bin/curl
 #usr/lib/libcurl.la
 #usr/lib/libcurl.so
 usr/lib/libcurl.so.4
-usr/lib/libcurl.so.4.6.0
+usr/lib/libcurl.so.4.7.0
 #usr/lib/pkgconfig/libcurl.pc
 #usr/share/aclocal/libcurl.m4
 #usr/share/man/man1/curl-config.1
@@ -31,6 +32,7 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
 #usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
 #usr/share/man/man3/CURLINFO_COOKIELIST.3
+#usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3
 #usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
 #usr/share/man/man3/CURLINFO_FILETIME.3
 #usr/share/man/man3/CURLINFO_FILETIME_T.3
@@ -53,6 +55,7 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/CURLINFO_PRIVATE.3
 #usr/share/man/man3/CURLINFO_PROTOCOL.3
 #usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3
+#usr/share/man/man3/CURLINFO_PROXY_ERROR.3
 #usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
 #usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
 #usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
@@ -325,6 +328,7 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3
 #usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3
 #usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3
+#usr/share/man/man3/CURLOPT_SSL_EC_CURVES.3
 #usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3
 #usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3
 #usr/share/man/man3/CURLOPT_SSL_FALSESTART.3
@@ -381,6 +385,9 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/curl_easy_escape.3
 #usr/share/man/man3/curl_easy_getinfo.3
 #usr/share/man/man3/curl_easy_init.3
+#usr/share/man/man3/curl_easy_option_by_id.3
+#usr/share/man/man3/curl_easy_option_by_name.3
+#usr/share/man/man3/curl_easy_option_next.3
 #usr/share/man/man3/curl_easy_pause.3
 #usr/share/man/man3/curl_easy_perform.3
 #usr/share/man/man3/curl_easy_recv.3
diff --git a/config/rootfiles/common/file b/config/rootfiles/common/file
index c48045abe..08f7fefab 100644
--- a/config/rootfiles/common/file
+++ b/config/rootfiles/common/file
@@ -1,10 +1,10 @@
 usr/bin/file
 #usr/include/magic.h
-#usr/lib/libmagic.a
 #usr/lib/libmagic.la
 #usr/lib/libmagic.so
 usr/lib/libmagic.so.1
 usr/lib/libmagic.so.1.0.0
+#usr/lib/pkgconfig/libmagic.pc
 #usr/share/man/man1/file.1
 #usr/share/man/man3/libmagic.3
 #usr/share/man/man4/magic.4
diff --git a/config/rootfiles/common/gdb b/config/rootfiles/common/gdb
new file mode 100644
index 000000000..0bb907f5e
--- /dev/null
+++ b/config/rootfiles/common/gdb
@@ -0,0 +1,63 @@
+#usr/bin/gcore
+#usr/bin/gdb
+#usr/bin/gdb-add-index
+#usr/bin/gdbserver
+#usr/include/gdb
+#usr/include/gdb/jit-reader.h
+#usr/lib/libinproctrace.so
+#usr/share/gdb/python
+#usr/share/gdb/python/gdb
+#usr/share/gdb/python/gdb/FrameDecorator.py
+#usr/share/gdb/python/gdb/FrameIterator.py
+#usr/share/gdb/python/gdb/__init__.py
+#usr/share/gdb/python/gdb/command
+#usr/share/gdb/python/gdb/command/__init__.py
+#usr/share/gdb/python/gdb/command/explore.py
+#usr/share/gdb/python/gdb/command/frame_filters.py
+#usr/share/gdb/python/gdb/command/pretty_printers.py
+#usr/share/gdb/python/gdb/command/prompt.py
+#usr/share/gdb/python/gdb/command/type_printers.py
+#usr/share/gdb/python/gdb/command/unwinders.py
+#usr/share/gdb/python/gdb/command/xmethods.py
+#usr/share/gdb/python/gdb/frames.py
+#usr/share/gdb/python/gdb/function
+#usr/share/gdb/python/gdb/function/__init__.py
+#usr/share/gdb/python/gdb/function/as_string.py
+#usr/share/gdb/python/gdb/function/caller_is.py
+#usr/share/gdb/python/gdb/function/strfns.py
+#usr/share/gdb/python/gdb/printer
+#usr/share/gdb/python/gdb/printer/__init__.py
+#usr/share/gdb/python/gdb/printer/bound_registers.py
+#usr/share/gdb/python/gdb/printing.py
+#usr/share/gdb/python/gdb/prompt.py
+#usr/share/gdb/python/gdb/types.py
+#usr/share/gdb/python/gdb/unwinder.py
+#usr/share/gdb/python/gdb/xmethod.py
+#usr/share/gdb/syscalls
+#usr/share/gdb/syscalls/aarch64-linux.xml
+#usr/share/gdb/syscalls/amd64-linux.xml
+#usr/share/gdb/syscalls/arm-linux.xml
+#usr/share/gdb/syscalls/freebsd.xml
+#usr/share/gdb/syscalls/gdb-syscalls.dtd
+#usr/share/gdb/syscalls/i386-linux.xml
+#usr/share/gdb/syscalls/mips-n32-linux.xml
+#usr/share/gdb/syscalls/mips-n64-linux.xml
+#usr/share/gdb/syscalls/mips-o32-linux.xml
+#usr/share/gdb/syscalls/netbsd.xml
+#usr/share/gdb/syscalls/ppc-linux.xml
+#usr/share/gdb/syscalls/ppc64-linux.xml
+#usr/share/gdb/syscalls/s390-linux.xml
+#usr/share/gdb/syscalls/s390x-linux.xml
+#usr/share/gdb/syscalls/sparc-linux.xml
+#usr/share/gdb/syscalls/sparc64-linux.xml
+#usr/share/gdb/system-gdbinit
+#usr/share/gdb/system-gdbinit/elinos.py
+#usr/share/gdb/system-gdbinit/wrs-linux.py
+#usr/share/info/annotate.info
+#usr/share/info/gdb.info
+#usr/share/info/stabs.info
+#usr/share/man/man1/gcore.1
+#usr/share/man/man1/gdb-add-index.1
+#usr/share/man/man1/gdb.1
+#usr/share/man/man1/gdbserver.1
+#usr/share/man/man5/gdbinit.5
diff --git a/config/rootfiles/common/i586/intel-microcode b/config/rootfiles/common/i586/intel-microcode
index 9b3c50897..ee43ff015 100644
--- a/config/rootfiles/common/i586/intel-microcode
+++ b/config/rootfiles/common/i586/intel-microcode
@@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03
 lib/firmware/intel-ucode/06-55-04
 lib/firmware/intel-ucode/06-55-06
 lib/firmware/intel-ucode/06-55-07
+lib/firmware/intel-ucode/06-55-0b
 lib/firmware/intel-ucode/06-56-02
 lib/firmware/intel-ucode/06-56-03
 lib/firmware/intel-ucode/06-56-04
@@ -82,6 +83,7 @@ lib/firmware/intel-ucode/06-66-03
 lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
+lib/firmware/intel-ucode/06-8a-01
 lib/firmware/intel-ucode/06-8e-09
 lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b
@@ -91,7 +93,11 @@ lib/firmware/intel-ucode/06-9e-0a
 lib/firmware/intel-ucode/06-9e-0b
 lib/firmware/intel-ucode/06-9e-0c
 lib/firmware/intel-ucode/06-9e-0d
+lib/firmware/intel-ucode/06-a5-02
+lib/firmware/intel-ucode/06-a5-03
+lib/firmware/intel-ucode/06-a5-05
 lib/firmware/intel-ucode/06-a6-00
+lib/firmware/intel-ucode/06-a6-01
 lib/firmware/intel-ucode/0f-00-07
 lib/firmware/intel-ucode/0f-00-0a
 lib/firmware/intel-ucode/0f-01-02
diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive
index 10950c9fc..a4038b13f 100644
--- a/config/rootfiles/common/libarchive
+++ b/config/rootfiles/common/libarchive
@@ -5,8 +5,8 @@
 #usr/include/archive_entry.h
 #usr/lib/libarchive.la
 #usr/lib/libarchive.so
-#usr/lib/libarchive.so.13
-#usr/lib/libarchive.so.13.4.0
+usr/lib/libarchive.so.13
+usr/lib/libarchive.so.13.4.0
 #usr/lib/pkgconfig/libarchive.pc
 #usr/share/man/man1/bsdcat.1
 #usr/share/man/man1/bsdcpio.1
diff --git a/config/rootfiles/common/libloc b/config/rootfiles/common/libloc
index b12052074..e8776e56e 100644
--- a/config/rootfiles/common/libloc
+++ b/config/rootfiles/common/libloc
@@ -1,12 +1,15 @@
 usr/bin/location
 #usr/bin/location-importer
 #usr/include/libloc
+#usr/include/libloc/as-list.h
 #usr/include/libloc/as.h
 #usr/include/libloc/compat.h
+#usr/include/libloc/country-list.h
 #usr/include/libloc/country.h
 #usr/include/libloc/database.h
 #usr/include/libloc/format.h
 #usr/include/libloc/libloc.h
+#usr/include/libloc/network-list.h
 #usr/include/libloc/network.h
 #usr/include/libloc/private.h
 #usr/include/libloc/resolv.h
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 547842db3..41ccc885e 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -19,7 +19,6 @@ usr/sbin/openvpn
 #usr/share/doc/openvpn/README.down-root
 #usr/share/doc/openvpn/README.mbedtls
 #usr/share/doc/openvpn/management-notes.txt
-#usr/share/man/man8/openvpn.8
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
 var/ipfire/ovpn/ccd
diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 41b02525d..f891fa449 100644
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -3,6 +3,7 @@ etc/suricata/suricata.yaml
 #root/.cargo
 #root/.cargo/.package-cache
 usr/bin/suricata
+#usr/include/suricata-plugin.h
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS
 #usr/share/doc/suricata/Basic_Setup.txt
diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata
index f560ca5e6..7531cfb64 100644
--- a/config/rootfiles/common/tzdata
+++ b/config/rootfiles/common/tzdata
@@ -181,6 +181,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/America/North_Dakota/Beulah
 #usr/share/zoneinfo/America/North_Dakota/Center
 #usr/share/zoneinfo/America/North_Dakota/New_Salem
+#usr/share/zoneinfo/America/Nuuk
 #usr/share/zoneinfo/America/Ojinaga
 #usr/share/zoneinfo/America/Panama
 #usr/share/zoneinfo/America/Pangnirtung
@@ -503,6 +504,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Europe/Zagreb
 #usr/share/zoneinfo/Europe/Zaporozhye
 #usr/share/zoneinfo/Europe/Zurich
+#usr/share/zoneinfo/Factory
 #usr/share/zoneinfo/GB
 #usr/share/zoneinfo/GB-Eire
 #usr/share/zoneinfo/GMT
@@ -606,7 +608,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/US/Michigan
 #usr/share/zoneinfo/US/Mountain
 #usr/share/zoneinfo/US/Pacific
-#usr/share/zoneinfo/US/Pacific-New
 #usr/share/zoneinfo/US/Samoa
 #usr/share/zoneinfo/UTC
 #usr/share/zoneinfo/Universal
@@ -796,6 +797,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/America/North_Dakota/Beulah
 #usr/share/zoneinfo/posix/America/North_Dakota/Center
 #usr/share/zoneinfo/posix/America/North_Dakota/New_Salem
+#usr/share/zoneinfo/posix/America/Nuuk
 #usr/share/zoneinfo/posix/America/Ojinaga
 #usr/share/zoneinfo/posix/America/Panama
 #usr/share/zoneinfo/posix/America/Pangnirtung
@@ -1118,6 +1120,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe/Zagreb
 #usr/share/zoneinfo/posix/Europe/Zaporozhye
 #usr/share/zoneinfo/posix/Europe/Zurich
+#usr/share/zoneinfo/posix/Factory
 #usr/share/zoneinfo/posix/GB
 #usr/share/zoneinfo/posix/GB-Eire
 #usr/share/zoneinfo/posix/GMT
@@ -1221,7 +1224,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/US/Michigan
 #usr/share/zoneinfo/posix/US/Mountain
 #usr/share/zoneinfo/posix/US/Pacific
-#usr/share/zoneinfo/posix/US/Pacific-New
 #usr/share/zoneinfo/posix/US/Samoa
 #usr/share/zoneinfo/posix/UTC
 #usr/share/zoneinfo/posix/Universal
@@ -1411,6 +1413,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/America/North_Dakota/Beulah
 #usr/share/zoneinfo/right/America/North_Dakota/Center
 #usr/share/zoneinfo/right/America/North_Dakota/New_Salem
+#usr/share/zoneinfo/right/America/Nuuk
 #usr/share/zoneinfo/right/America/Ojinaga
 #usr/share/zoneinfo/right/America/Panama
 #usr/share/zoneinfo/right/America/Pangnirtung
@@ -1733,6 +1736,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe/Zagreb
 #usr/share/zoneinfo/right/Europe/Zaporozhye
 #usr/share/zoneinfo/right/Europe/Zurich
+#usr/share/zoneinfo/right/Factory
 #usr/share/zoneinfo/right/GB
 #usr/share/zoneinfo/right/GB-Eire
 #usr/share/zoneinfo/right/GMT
@@ -1836,7 +1840,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/US/Michigan
 #usr/share/zoneinfo/right/US/Mountain
 #usr/share/zoneinfo/right/US/Pacific
-#usr/share/zoneinfo/right/US/Pacific-New
 #usr/share/zoneinfo/right/US/Samoa
 #usr/share/zoneinfo/right/UTC
 #usr/share/zoneinfo/right/Universal
diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index 767fae512..724aa4a3b 100644
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -3,6 +3,7 @@ lib/udev/rules.d/40-usb_modeswitch.rules
 #usr/share/usb_modeswitch
 usr/share/usb_modeswitch/03f0:002a
 usr/share/usb_modeswitch/03f0:032a
+usr/share/usb_modeswitch/03f0:0857
 usr/share/usb_modeswitch/03f0:371d
 usr/share/usb_modeswitch/03f0:4b1d
 usr/share/usb_modeswitch/03f0:4e1d
@@ -59,6 +60,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=CELOT
 usr/share/usb_modeswitch/05c6:1000:uMa=Co.,Ltd
 usr/share/usb_modeswitch/05c6:1000:uMa=DGT
 usr/share/usb_modeswitch/05c6:1000:uMa=Option
+usr/share/usb_modeswitch/05c6:1000:uMa=Qualcomm
 usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
 usr/share/usb_modeswitch/05c6:1000:uMa=SSE
 usr/share/usb_modeswitch/05c6:1000:uMa=StrongRising
@@ -145,6 +147,7 @@ usr/share/usb_modeswitch/0b3c:c700
 usr/share/usb_modeswitch/0b3c:f000
 usr/share/usb_modeswitch/0b3c:f00c
 usr/share/usb_modeswitch/0b3c:f017
+usr/share/usb_modeswitch/0bda:1a2b
 usr/share/usb_modeswitch/0bdb:190d
 usr/share/usb_modeswitch/0bdb:1910
 usr/share/usb_modeswitch/0cf3:20ff
@@ -153,6 +156,7 @@ usr/share/usb_modeswitch/0d46:45a5
 usr/share/usb_modeswitch/0df7:0800
 usr/share/usb_modeswitch/0e8d:0002:uPr=MT
 usr/share/usb_modeswitch/0e8d:0002:uPr=Product
+usr/share/usb_modeswitch/0e8d:2870
 usr/share/usb_modeswitch/0e8d:7109
 usr/share/usb_modeswitch/0fca:8020
 usr/share/usb_modeswitch/0fce:d0cf
@@ -248,6 +252,7 @@ usr/share/usb_modeswitch/12d1:15d0
 usr/share/usb_modeswitch/12d1:15d2
 usr/share/usb_modeswitch/12d1:15e7
 usr/share/usb_modeswitch/12d1:15ec
+usr/share/usb_modeswitch/12d1:15ee
 usr/share/usb_modeswitch/12d1:15f0
 usr/share/usb_modeswitch/12d1:1805
 usr/share/usb_modeswitch/12d1:1c0b
@@ -264,6 +269,7 @@ usr/share/usb_modeswitch/12d1:1f05
 usr/share/usb_modeswitch/12d1:1f06
 usr/share/usb_modeswitch/12d1:1f07
 usr/share/usb_modeswitch/12d1:1f09
+usr/share/usb_modeswitch/12d1:1f0a
 usr/share/usb_modeswitch/12d1:1f11
 usr/share/usb_modeswitch/12d1:1f15
 usr/share/usb_modeswitch/12d1:1f16
@@ -286,12 +292,16 @@ usr/share/usb_modeswitch/1410:5055
 usr/share/usb_modeswitch/1410:5059
 usr/share/usb_modeswitch/1410:7001
 usr/share/usb_modeswitch/1410:9020
+usr/share/usb_modeswitch/1410:9030
+usr/share/usb_modeswitch/1410:b00c
 usr/share/usb_modeswitch/148e:a000
 usr/share/usb_modeswitch/148f:2578
 usr/share/usb_modeswitch/148f:2878
 usr/share/usb_modeswitch/15eb:7153
+usr/share/usb_modeswitch/15eb:a403
 usr/share/usb_modeswitch/1614:0800
 usr/share/usb_modeswitch/1614:0802
+usr/share/usb_modeswitch/161c:f010
 usr/share/usb_modeswitch/16d5:f000
 usr/share/usb_modeswitch/16d8:6281
 usr/share/usb_modeswitch/16d8:6803
@@ -360,6 +370,7 @@ usr/share/usb_modeswitch/19d2:1233
 usr/share/usb_modeswitch/19d2:1237
 usr/share/usb_modeswitch/19d2:1238
 usr/share/usb_modeswitch/19d2:1420
+usr/share/usb_modeswitch/19d2:1421
 usr/share/usb_modeswitch/19d2:1511
 usr/share/usb_modeswitch/19d2:1514
 usr/share/usb_modeswitch/19d2:1517
@@ -391,6 +402,7 @@ usr/share/usb_modeswitch/1bbb:f000
 usr/share/usb_modeswitch/1bbb:f017
 usr/share/usb_modeswitch/1bbb:f052
 usr/share/usb_modeswitch/1c9e:1001
+usr/share/usb_modeswitch/1c9e:3003
 usr/share/usb_modeswitch/1c9e:6000
 usr/share/usb_modeswitch/1c9e:6061:uPr=Storage
 usr/share/usb_modeswitch/1c9e:9101
@@ -405,6 +417,7 @@ usr/share/usb_modeswitch/1c9e:9e08
 usr/share/usb_modeswitch/1c9e:f000
 usr/share/usb_modeswitch/1c9e:f000:uMa=USB_Modem
 usr/share/usb_modeswitch/1c9e:f010
+usr/share/usb_modeswitch/1c9e:f030
 usr/share/usb_modeswitch/1d09:1000
 usr/share/usb_modeswitch/1d09:1021
 usr/share/usb_modeswitch/1d09:1025
@@ -452,10 +465,12 @@ usr/share/usb_modeswitch/2001:a805
 usr/share/usb_modeswitch/2001:a809
 usr/share/usb_modeswitch/2001:a80b
 usr/share/usb_modeswitch/2001:ab00
+usr/share/usb_modeswitch/2001:ac01
 usr/share/usb_modeswitch/2015:0001
 usr/share/usb_modeswitch/201e:1023
 usr/share/usb_modeswitch/201e:2009
 usr/share/usb_modeswitch/2020:0002
+usr/share/usb_modeswitch/2020:2030
 usr/share/usb_modeswitch/2020:f00e
 usr/share/usb_modeswitch/2020:f00f
 usr/share/usb_modeswitch/2077:1000
@@ -479,12 +494,23 @@ usr/share/usb_modeswitch/230d:000d
 usr/share/usb_modeswitch/230d:0101
 usr/share/usb_modeswitch/230d:0103
 usr/share/usb_modeswitch/2357:0200
+usr/share/usb_modeswitch/2357:0600
 usr/share/usb_modeswitch/2357:f000
 usr/share/usb_modeswitch/23a2:1010
 usr/share/usb_modeswitch/257a:a000
 usr/share/usb_modeswitch/257a:b000
 usr/share/usb_modeswitch/257a:c000
 usr/share/usb_modeswitch/257a:d000
+usr/share/usb_modeswitch/2fd4:9aff
+usr/share/usb_modeswitch/413c:81a2
+usr/share/usb_modeswitch/413c:81a3
+usr/share/usb_modeswitch/413c:81a4
+usr/share/usb_modeswitch/413c:81a8
+usr/share/usb_modeswitch/413c:81b1
+usr/share/usb_modeswitch/413c:81b3
+usr/share/usb_modeswitch/413c:81d7
+usr/share/usb_modeswitch/413c:81e0
 usr/share/usb_modeswitch/6000:1000
 usr/share/usb_modeswitch/8888:6500
 usr/share/usb_modeswitch/ed09:1021
+usr/share/usb_modeswitch/new.lst
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 44856fcc2..3eac4411a 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -308,6 +308,7 @@ srv/web/ipfire/html/images/wakeup.gif
 srv/web/ipfire/html/images/window-new.png
 srv/web/ipfire/html/include
 srv/web/ipfire/html/include/snortupdateutility.js
+srv/web/ipfire/html/include/zoneconf.js
 srv/web/ipfire/html/index.cgi
 srv/web/ipfire/html/redirect-templates
 srv/web/ipfire/html/redirect-templates/legacy
diff --git a/config/rootfiles/common/x86_64/go b/config/rootfiles/common/x86_64/go
index 812953107..f3139469b 100644
--- a/config/rootfiles/common/x86_64/go
+++ b/config/rootfiles/common/x86_64/go
@@ -11,6 +11,7 @@
 #usr/lib/go/api/go1.12.txt
 #usr/lib/go/api/go1.13.txt
 #usr/lib/go/api/go1.14.txt
+#usr/lib/go/api/go1.15.txt
 #usr/lib/go/api/go1.2.txt
 #usr/lib/go/api/go1.3.txt
 #usr/lib/go/api/go1.4.txt
@@ -194,6 +195,9 @@
 #usr/lib/go/misc/cgo/test/testdata/issue30527.go
 #usr/lib/go/misc/cgo/test/testdata/issue30527/a.go
 #usr/lib/go/misc/cgo/test/testdata/issue30527/b.go
+#usr/lib/go/misc/cgo/test/testdata/issue41761.go
+#usr/lib/go/misc/cgo/test/testdata/issue41761a
+#usr/lib/go/misc/cgo/test/testdata/issue41761a/a.go
 #usr/lib/go/misc/cgo/test/testdata/issue8756
 #usr/lib/go/misc/cgo/test/testdata/issue8756.go
 #usr/lib/go/misc/cgo/test/testdata/issue8756/issue8756.go
@@ -288,6 +292,8 @@
 #usr/lib/go/misc/cgo/testgodefs/testdata/fieldtypedef.go
 #usr/lib/go/misc/cgo/testgodefs/testdata/issue37479.go
 #usr/lib/go/misc/cgo/testgodefs/testdata/issue37621.go
+#usr/lib/go/misc/cgo/testgodefs/testdata/issue38649.go
+#usr/lib/go/misc/cgo/testgodefs/testdata/issue39534.go
 #usr/lib/go/misc/cgo/testgodefs/testdata/issue8478.go
 #usr/lib/go/misc/cgo/testgodefs/testdata/main.go
 #usr/lib/go/misc/cgo/testgodefs/testgodefs_test.go
@@ -411,6 +417,11 @@
 #usr/lib/go/misc/cgo/testshared/testdata/execgo/exe.go
 #usr/lib/go/misc/cgo/testshared/testdata/explicit
 #usr/lib/go/misc/cgo/testshared/testdata/explicit/explicit.go
+#usr/lib/go/misc/cgo/testshared/testdata/gcdata
+#usr/lib/go/misc/cgo/testshared/testdata/gcdata/main
+#usr/lib/go/misc/cgo/testshared/testdata/gcdata/main/main.go
+#usr/lib/go/misc/cgo/testshared/testdata/gcdata/p
+#usr/lib/go/misc/cgo/testshared/testdata/gcdata/p/p.go
 #usr/lib/go/misc/cgo/testshared/testdata/global
 #usr/lib/go/misc/cgo/testshared/testdata/global/main.go
 #usr/lib/go/misc/cgo/testshared/testdata/globallib
@@ -433,6 +444,11 @@
 #usr/lib/go/misc/cgo/testshared/testdata/issue30768/issue30768lib
 #usr/lib/go/misc/cgo/testshared/testdata/issue30768/issue30768lib/lib.go
 #usr/lib/go/misc/cgo/testshared/testdata/issue30768/x_test.go
+#usr/lib/go/misc/cgo/testshared/testdata/issue39777
+#usr/lib/go/misc/cgo/testshared/testdata/issue39777/a
+#usr/lib/go/misc/cgo/testshared/testdata/issue39777/a/a.go
+#usr/lib/go/misc/cgo/testshared/testdata/issue39777/b
+#usr/lib/go/misc/cgo/testshared/testdata/issue39777/b/b.go
 #usr/lib/go/misc/cgo/testshared/testdata/trivial
 #usr/lib/go/misc/cgo/testshared/testdata/trivial/trivial.go
 #usr/lib/go/misc/cgo/testsigfwd
@@ -632,6 +648,7 @@
 #usr/lib/go/pkg/linux_amd64/internal/obscuretestdata.a
 #usr/lib/go/pkg/linux_amd64/internal/oserror.a
 #usr/lib/go/pkg/linux_amd64/internal/poll.a
+#usr/lib/go/pkg/linux_amd64/internal/profile.a
 #usr/lib/go/pkg/linux_amd64/internal/race.a
 #usr/lib/go/pkg/linux_amd64/internal/reflectlite.a
 #usr/lib/go/pkg/linux_amd64/internal/singleflight.a
@@ -641,6 +658,7 @@
 #usr/lib/go/pkg/linux_amd64/internal/testenv.a
 #usr/lib/go/pkg/linux_amd64/internal/testlog.a
 #usr/lib/go/pkg/linux_amd64/internal/trace.a
+#usr/lib/go/pkg/linux_amd64/internal/unsafeheader.a
 #usr/lib/go/pkg/linux_amd64/internal/xcoff.a
 #usr/lib/go/pkg/linux_amd64/io
 #usr/lib/go/pkg/linux_amd64/io.a
@@ -703,10 +721,7 @@
 #usr/lib/go/pkg/linux_amd64/runtime/internal/atomic.a
 #usr/lib/go/pkg/linux_amd64/runtime/internal/math.a
 #usr/lib/go/pkg/linux_amd64/runtime/internal/sys.a
-#usr/lib/go/pkg/linux_amd64/runtime/pprof
 #usr/lib/go/pkg/linux_amd64/runtime/pprof.a
-#usr/lib/go/pkg/linux_amd64/runtime/pprof/internal
-#usr/lib/go/pkg/linux_amd64/runtime/pprof/internal/profile.a
 #usr/lib/go/pkg/linux_amd64/runtime/race.a
 #usr/lib/go/pkg/linux_amd64/runtime/trace.a
 #usr/lib/go/pkg/linux_amd64/sort.a
@@ -728,7 +743,9 @@
 #usr/lib/go/pkg/linux_amd64/text/template
 #usr/lib/go/pkg/linux_amd64/text/template.a
 #usr/lib/go/pkg/linux_amd64/text/template/parse.a
+#usr/lib/go/pkg/linux_amd64/time
 #usr/lib/go/pkg/linux_amd64/time.a
+#usr/lib/go/pkg/linux_amd64/time/tzdata.a
 #usr/lib/go/pkg/linux_amd64/unicode
 #usr/lib/go/pkg/linux_amd64/unicode.a
 #usr/lib/go/pkg/linux_amd64/unicode/utf16.a
@@ -891,6 +908,7 @@
 #usr/lib/go/pkg/linux_amd64_race/internal/obscuretestdata.a
 #usr/lib/go/pkg/linux_amd64_race/internal/oserror.a
 #usr/lib/go/pkg/linux_amd64_race/internal/poll.a
+#usr/lib/go/pkg/linux_amd64_race/internal/profile.a
 #usr/lib/go/pkg/linux_amd64_race/internal/race.a
 #usr/lib/go/pkg/linux_amd64_race/internal/reflectlite.a
 #usr/lib/go/pkg/linux_amd64_race/internal/singleflight.a
@@ -900,6 +918,7 @@
 #usr/lib/go/pkg/linux_amd64_race/internal/testenv.a
 #usr/lib/go/pkg/linux_amd64_race/internal/testlog.a
 #usr/lib/go/pkg/linux_amd64_race/internal/trace.a
+#usr/lib/go/pkg/linux_amd64_race/internal/unsafeheader.a
 #usr/lib/go/pkg/linux_amd64_race/internal/xcoff.a
 #usr/lib/go/pkg/linux_amd64_race/io
 #usr/lib/go/pkg/linux_amd64_race/io.a
@@ -962,10 +981,7 @@
 #usr/lib/go/pkg/linux_amd64_race/runtime/internal/atomic.a
 #usr/lib/go/pkg/linux_amd64_race/runtime/internal/math.a
 #usr/lib/go/pkg/linux_amd64_race/runtime/internal/sys.a
-#usr/lib/go/pkg/linux_amd64_race/runtime/pprof
 #usr/lib/go/pkg/linux_amd64_race/runtime/pprof.a
-#usr/lib/go/pkg/linux_amd64_race/runtime/pprof/internal
-#usr/lib/go/pkg/linux_amd64_race/runtime/pprof/internal/profile.a
 #usr/lib/go/pkg/linux_amd64_race/runtime/race.a
 #usr/lib/go/pkg/linux_amd64_race/runtime/trace.a
 #usr/lib/go/pkg/linux_amd64_race/sort.a
@@ -987,7 +1003,9 @@
 #usr/lib/go/pkg/linux_amd64_race/text/template
 #usr/lib/go/pkg/linux_amd64_race/text/template.a
 #usr/lib/go/pkg/linux_amd64_race/text/template/parse.a
+#usr/lib/go/pkg/linux_amd64_race/time
 #usr/lib/go/pkg/linux_amd64_race/time.a
+#usr/lib/go/pkg/linux_amd64_race/time/tzdata.a
 #usr/lib/go/pkg/linux_amd64_race/unicode
 #usr/lib/go/pkg/linux_amd64_race/unicode.a
 #usr/lib/go/pkg/linux_amd64_race/unicode/utf16.a
@@ -1215,6 +1233,7 @@
 #usr/lib/go/src/cmd/asm/internal/arch/arm64.go
 #usr/lib/go/src/cmd/asm/internal/arch/mips.go
 #usr/lib/go/src/cmd/asm/internal/arch/ppc64.go
+#usr/lib/go/src/cmd/asm/internal/arch/riscv64.go
 #usr/lib/go/src/cmd/asm/internal/arch/s390x.go
 #usr/lib/go/src/cmd/asm/internal/asm
 #usr/lib/go/src/cmd/asm/internal/asm/asm.go
@@ -1303,7 +1322,9 @@
 #usr/lib/go/src/cmd/compile/internal/arm64/ssa.go
 #usr/lib/go/src/cmd/compile/internal/gc
 #usr/lib/go/src/cmd/compile/internal/gc/alg.go
+#usr/lib/go/src/cmd/compile/internal/gc/algkind_string.go
 #usr/lib/go/src/cmd/compile/internal/gc/align.go
+#usr/lib/go/src/cmd/compile/internal/gc/bench_test.go
 #usr/lib/go/src/cmd/compile/internal/gc/bexport.go
 #usr/lib/go/src/cmd/compile/internal/gc/bimport.go
 #usr/lib/go/src/cmd/compile/internal/gc/bitset.go
@@ -1410,6 +1431,7 @@
 #usr/lib/go/src/cmd/compile/internal/gc/testdata/reproducible/issue20272.go
 #usr/lib/go/src/cmd/compile/internal/gc/testdata/reproducible/issue27013.go
 #usr/lib/go/src/cmd/compile/internal/gc/testdata/reproducible/issue30202.go
+#usr/lib/go/src/cmd/compile/internal/gc/testdata/reproducible/issue38068.go
 #usr/lib/go/src/cmd/compile/internal/gc/testdata/short_test.go
 #usr/lib/go/src/cmd/compile/internal/gc/testdata/slice_test.go
 #usr/lib/go/src/cmd/compile/internal/gc/testdata/sqrtConst_test.go
@@ -1457,6 +1479,7 @@
 #usr/lib/go/src/cmd/compile/internal/ssa
 #usr/lib/go/src/cmd/compile/internal/ssa/README.md
 #usr/lib/go/src/cmd/compile/internal/ssa/TODO
+#usr/lib/go/src/cmd/compile/internal/ssa/addressingmodes.go
 #usr/lib/go/src/cmd/compile/internal/ssa/biasedsparsemap.go
 #usr/lib/go/src/cmd/compile/internal/ssa/block.go
 #usr/lib/go/src/cmd/compile/internal/ssa/branchelim.go
@@ -1482,9 +1505,13 @@
 #usr/lib/go/src/cmd/compile/internal/ssa/dom_test.go
 #usr/lib/go/src/cmd/compile/internal/ssa/export_test.go
 #usr/lib/go/src/cmd/compile/internal/ssa/flagalloc.go
+#usr/lib/go/src/cmd/compile/internal/ssa/flags_amd64_test.s
+#usr/lib/go/src/cmd/compile/internal/ssa/flags_arm64_test.s
+#usr/lib/go/src/cmd/compile/internal/ssa/flags_test.go
 #usr/lib/go/src/cmd/compile/internal/ssa/func.go
 #usr/lib/go/src/cmd/compile/internal/ssa/func_test.go
 #usr/lib/go/src/cmd/compile/internal/ssa/fuse.go
+#usr/lib/go/src/cmd/compile/internal/ssa/fuse_comparisons.go
 #usr/lib/go/src/cmd/compile/internal/ssa/fuse_test.go
 #usr/lib/go/src/cmd/compile/internal/ssa/gen
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/386.rules
@@ -1510,6 +1537,7 @@
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/S390XOps.go
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/Wasm.rules
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/WasmOps.go
+#usr/lib/go/src/cmd/compile/internal/ssa/gen/cover.bash
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/dec.rules
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/dec64.rules
 #usr/lib/go/src/cmd/compile/internal/ssa/gen/dec64Ops.go
@@ -1557,6 +1585,7 @@
 #usr/lib/go/src/cmd/compile/internal/ssa/rewriteAMD64splitload.go
 #usr/lib/go/src/cmd/compile/internal/ssa/rewriteARM.go
 #usr/lib/go/src/cmd/compile/internal/ssa/rewriteARM64.go
+#usr/lib/go/src/cmd/compile/internal/ssa/rewriteCond_test.go
 #usr/lib/go/src/cmd/compile/internal/ssa/rewriteMIPS.go
 #usr/lib/go/src/cmd/compile/internal/ssa/rewriteMIPS64.go
 #usr/lib/go/src/cmd/compile/internal/ssa/rewritePPC64.go
@@ -1604,6 +1633,7 @@
 #usr/lib/go/src/cmd/compile/internal/ssa/testdata/scopes.go
 #usr/lib/go/src/cmd/compile/internal/ssa/tighten.go
 #usr/lib/go/src/cmd/compile/internal/ssa/trim.go
+#usr/lib/go/src/cmd/compile/internal/ssa/tuple.go
 #usr/lib/go/src/cmd/compile/internal/ssa/value.go
 #usr/lib/go/src/cmd/compile/internal/ssa/writebarrier.go
 #usr/lib/go/src/cmd/compile/internal/ssa/writebarrier_test.go
@@ -1663,6 +1693,7 @@
 #usr/lib/go/src/cmd/cover/doc.go
 #usr/lib/go/src/cmd/cover/func.go
 #usr/lib/go/src/cmd/cover/html.go
+#usr/lib/go/src/cmd/cover/pkgname_test.go
 #usr/lib/go/src/cmd/cover/profile.go
 #usr/lib/go/src/cmd/cover/testdata
 #usr/lib/go/src/cmd/cover/testdata/directives.go
@@ -1702,6 +1733,9 @@
 #usr/lib/go/src/cmd/doc/main.go
 #usr/lib/go/src/cmd/doc/pkg.go
 #usr/lib/go/src/cmd/doc/testdata
+#usr/lib/go/src/cmd/doc/testdata/merge
+#usr/lib/go/src/cmd/doc/testdata/merge/aa.go
+#usr/lib/go/src/cmd/doc/testdata/merge/bb.go
 #usr/lib/go/src/cmd/doc/testdata/nested
 #usr/lib/go/src/cmd/doc/testdata/nested/empty
 #usr/lib/go/src/cmd/doc/testdata/nested/empty/empty.go
@@ -1937,6 +1971,8 @@
 #usr/lib/go/src/cmd/go/internal/modload/init.go
 #usr/lib/go/src/cmd/go/internal/modload/list.go
 #usr/lib/go/src/cmd/go/internal/modload/load.go
+#usr/lib/go/src/cmd/go/internal/modload/modfile.go
+#usr/lib/go/src/cmd/go/internal/modload/mvs.go
 #usr/lib/go/src/cmd/go/internal/modload/query.go
 #usr/lib/go/src/cmd/go/internal/modload/query_test.go
 #usr/lib/go/src/cmd/go/internal/modload/search.go
@@ -1944,6 +1980,7 @@
 #usr/lib/go/src/cmd/go/internal/modload/stat_unix.go
 #usr/lib/go/src/cmd/go/internal/modload/stat_windows.go
 #usr/lib/go/src/cmd/go/internal/modload/testgo.go
+#usr/lib/go/src/cmd/go/internal/modload/vendor.go
 #usr/lib/go/src/cmd/go/internal/mvs
 #usr/lib/go/src/cmd/go/internal/mvs/mvs.go
 #usr/lib/go/src/cmd/go/internal/mvs/mvs_test.go
@@ -1970,6 +2007,9 @@
 #usr/lib/go/src/cmd/go/internal/str/str.go
 #usr/lib/go/src/cmd/go/internal/test
 #usr/lib/go/src/cmd/go/internal/test/cover.go
+#usr/lib/go/src/cmd/go/internal/test/flagdefs.go
+#usr/lib/go/src/cmd/go/internal/test/flagdefs_test.go
+#usr/lib/go/src/cmd/go/internal/test/genflags.go
 #usr/lib/go/src/cmd/go/internal/test/test.go
 #usr/lib/go/src/cmd/go/internal/test/testflag.go
 #usr/lib/go/src/cmd/go/internal/tool
@@ -2013,15 +2053,8 @@
 #usr/lib/go/src/cmd/go/script_test.go
 #usr/lib/go/src/cmd/go/testdata
 #usr/lib/go/src/cmd/go/testdata/addmod.go
-#usr/lib/go/src/cmd/go/testdata/example1_test.go
-#usr/lib/go/src/cmd/go/testdata/example2_test.go
 #usr/lib/go/src/cmd/go/testdata/failssh
 #usr/lib/go/src/cmd/go/testdata/failssh/ssh
-#usr/lib/go/src/cmd/go/testdata/generate
-#usr/lib/go/src/cmd/go/testdata/generate/test1.go
-#usr/lib/go/src/cmd/go/testdata/generate/test2.go
-#usr/lib/go/src/cmd/go/testdata/generate/test3.go
-#usr/lib/go/src/cmd/go/testdata/generate/test4.go
 #usr/lib/go/src/cmd/go/testdata/mod
 #usr/lib/go/src/cmd/go/testdata/mod/README
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_badchain_a_v1.0.0.txt
@@ -2033,6 +2066,8 @@
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_dotgo.go_v1.0.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_downgrade_v2.0.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_downgrade_v2_v2.0.1.txt
+#usr/lib/go/src/cmd/go/testdata/mod/example.com_incompatiblewithsub_v1.0.0.txt
+#usr/lib/go/src/cmd/go/testdata/mod/example.com_incompatiblewithsub_v2.0.0+incompatible.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_invalidpath_v1_v1.0.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_join_subpkg_v1.0.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_join_subpkg_v1.1.0.txt
@@ -2056,6 +2091,7 @@
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_pseudoupgrade_v0.0.0-20190430073000-30950c05d534.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_pseudoupgrade_v0.1.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_pseudoupgrade_v0.1.1-0.20190429073117-b5426c86b553.txt
+#usr/lib/go/src/cmd/go/testdata/mod/example.com_quote_v1.5.2.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_split_subpkg_v1.1.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_split_v1.0.0.txt
 #usr/lib/go/src/cmd/go/testdata/mod/example.com_split_v1.1.0.txt
@@ -2155,70 +2191,121 @@
 #usr/lib/go/src/cmd/go/testdata/modlegacy/src/old/p1/p1.go
 #usr/lib/go/src/cmd/go/testdata/modlegacy/src/old/p2
 #usr/lib/go/src/cmd/go/testdata/modlegacy/src/old/p2/p2.go
-#usr/lib/go/src/cmd/go/testdata/norunexample
-#usr/lib/go/src/cmd/go/testdata/norunexample/example_test.go
-#usr/lib/go/src/cmd/go/testdata/norunexample/test_test.go
-#usr/lib/go/src/cmd/go/testdata/print_goroot.go
-#usr/lib/go/src/cmd/go/testdata/rundir
-#usr/lib/go/src/cmd/go/testdata/rundir/sub
-#usr/lib/go/src/cmd/go/testdata/rundir/sub/sub.go
-#usr/lib/go/src/cmd/go/testdata/rundir/x.go
 #usr/lib/go/src/cmd/go/testdata/savedir.go
 #usr/lib/go/src/cmd/go/testdata/script
 #usr/lib/go/src/cmd/go/testdata/script/README
 #usr/lib/go/src/cmd/go/testdata/script/bug.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_GOTMPDIR.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_acl_windows.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_arm.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_cache_arch_mode.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_cache_compile.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_cache_gomips.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_cache_link.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_cache_output.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_cache_trimpath.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_cd_gopath_different.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_cgo_consistent_results.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_dash_n_cgo.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_dash_o_dev_null.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_dash_x.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_exe.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_gcflags.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_gopath_order.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_i.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_import_comment.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_import_cycle.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_internal.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_issue6480.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_link_x_import_path_escape.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_multi_main.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_n_cgo.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_no_go.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_nocache.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_output.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_package_not_stale_trailing_slash.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_patterns_outside_gopath.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_plugin_non_main.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_relative_pkgdir.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_relative_tmpdir.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_runtime_gcflags.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_tag_goexperiment.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_tags_no_comma.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_test_only.txt
 #usr/lib/go/src/cmd/go/testdata/script/build_trimpath.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_trimpath_cgo.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_unsupported_goos.txt
+#usr/lib/go/src/cmd/go/testdata/script/build_vendor.txt
 #usr/lib/go/src/cmd/go/testdata/script/cache_unix.txt
 #usr/lib/go/src/cmd/go/testdata/script/cache_vet.txt
 #usr/lib/go/src/cmd/go/testdata/script/cgo_asm_error.txt
+#usr/lib/go/src/cmd/go/testdata/script/cgo_bad_directives.txt
+#usr/lib/go/src/cmd/go/testdata/script/cgo_depends_on_syscall.txt
+#usr/lib/go/src/cmd/go/testdata/script/cgo_flag_contains_space.txt
 #usr/lib/go/src/cmd/go/testdata/script/cgo_syso_issue29253.txt
+#usr/lib/go/src/cmd/go/testdata/script/clean_cache_n.txt
 #usr/lib/go/src/cmd/go/testdata/script/clean_testcache.txt
 #usr/lib/go/src/cmd/go/testdata/script/cmd_import_error.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_asm.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_atomic_pkgall.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_blank_func_decl.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_cgo.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_cgo_extra_file.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_cgo_extra_test.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_cgo_xtest.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_dash_c.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_dep_loop.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_dot_import.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_error.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_import_main_loop.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_mod_empty.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_modes.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_pattern.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_pkgall_multiple_mains.txt
 #usr/lib/go/src/cmd/go/testdata/script/cover_pkgall_runtime.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_runs.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_statements.txt
+#usr/lib/go/src/cmd/go/testdata/script/cover_sync_atomic_import.txt
 #usr/lib/go/src/cmd/go/testdata/script/cpu_profile_twice.txt
 #usr/lib/go/src/cmd/go/testdata/script/devnull.txt
 #usr/lib/go/src/cmd/go/testdata/script/doc.txt
 #usr/lib/go/src/cmd/go/testdata/script/env_write.txt
 #usr/lib/go/src/cmd/go/testdata/script/fileline.txt
 #usr/lib/go/src/cmd/go/testdata/script/fmt_load_errors.txt
+#usr/lib/go/src/cmd/go/testdata/script/gccgo_link_c.txt
 #usr/lib/go/src/cmd/go/testdata/script/gccgo_m.txt
 #usr/lib/go/src/cmd/go/testdata/script/gccgo_mangle.txt
 #usr/lib/go/src/cmd/go/testdata/script/gcflags_patterns.txt
+#usr/lib/go/src/cmd/go/testdata/script/generate.txt
 #usr/lib/go/src/cmd/go/testdata/script/generate_bad_imports.txt
+#usr/lib/go/src/cmd/go/testdata/script/generate_env.txt
+#usr/lib/go/src/cmd/go/testdata/script/generate_invalid.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_404_meta.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_brace.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_custom_domain_wildcard.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_dash_t.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_domain_root.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_dot_slash_download.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_dotfiles.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_go_file.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_goroot.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_insecure.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_insecure_custom_domain.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_insecure_redirect.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_insecure_update.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_internal_wildcard.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_issue11307.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_non_pkg.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_race.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_test_only.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_tilde.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_unicode.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_update.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_update_all.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_update_unknown_protocol.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_update_wildcard.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_vcs_error_message.txt
+#usr/lib/go/src/cmd/go/testdata/script/get_vendor.txt
 #usr/lib/go/src/cmd/go/testdata/script/get_with_git_trace.txt
 #usr/lib/go/src/cmd/go/testdata/script/goflags.txt
 #usr/lib/go/src/cmd/go/testdata/script/gopath_install.txt
@@ -2227,30 +2314,50 @@
 #usr/lib/go/src/cmd/go/testdata/script/gopath_paths.txt
 #usr/lib/go/src/cmd/go/testdata/script/gopath_std_vendor.txt
 #usr/lib/go/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt
+#usr/lib/go/src/cmd/go/testdata/script/goroot_executable.txt
 #usr/lib/go/src/cmd/go/testdata/script/help.txt
+#usr/lib/go/src/cmd/go/testdata/script/import_cycle.txt
 #usr/lib/go/src/cmd/go/testdata/script/import_main.txt
+#usr/lib/go/src/cmd/go/testdata/script/install_cgo_excluded.txt
 #usr/lib/go/src/cmd/go/testdata/script/install_cleans_build.txt
 #usr/lib/go/src/cmd/go/testdata/script/install_cmd_gobin.txt
 #usr/lib/go/src/cmd/go/testdata/script/install_cross_gobin.txt
+#usr/lib/go/src/cmd/go/testdata/script/install_msan_and_race_require_cgo.txt
 #usr/lib/go/src/cmd/go/testdata/script/install_rebuild_gopath.txt
 #usr/lib/go/src/cmd/go/testdata/script/install_rebuild_removed.txt
+#usr/lib/go/src/cmd/go/testdata/script/install_relative_gobin_fail.txt
+#usr/lib/go/src/cmd/go/testdata/script/install_shadow_gopath.txt
+#usr/lib/go/src/cmd/go/testdata/script/issue36000.txt
 #usr/lib/go/src/cmd/go/testdata/script/link_syso_issue33139.txt
 #usr/lib/go/src/cmd/go/testdata/script/linkname.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_ambiguous_path.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_bad_import.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_case_collision.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_compiled_imports.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_constraints.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_dedup_packages.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_err_stack.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_find.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_gofile_in_goroot.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_importmap.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_linkshared.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_load_err.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_parse_err.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_permissions.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_shadow.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_split_main.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_std.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_symlink.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_symlink_internal.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_symlink_vendor_issue14054.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_symlink_vendor_issue15201.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_test_e.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_test_err.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_test_imports.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_test_non_go_files.txt
+#usr/lib/go/src/cmd/go/testdata/script/list_test_simple.txt
 #usr/lib/go/src/cmd/go/testdata/script/list_wildcard_skip_nonmatching.txt
+#usr/lib/go/src/cmd/go/testdata/script/load_test_pkg_err.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_alt_goroot.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_ambiguous_import.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_auth.txt
@@ -2264,6 +2371,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_case_cgo.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_clean_cache.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_concurrent.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_concurrent_unzipinplace.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_convert_dep.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_convert_git.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_convert_glide.txt
@@ -2280,6 +2388,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_domain_root.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_dot.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_download.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_download_concurrent_read.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_download_hash.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_download_json.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_download_partial.txt
@@ -2296,11 +2405,13 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_direct.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_downgrade.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_fallback.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_get_go_file.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_hash.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_incompatible.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_indirect.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_insecure_redirect.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_latest_pseudo.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_get_legacy.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_local.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_main.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_major.txt
@@ -2308,6 +2419,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_newcycle.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_none.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_patterns.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_get_prefer_incompatible.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_private_vcs.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_pseudo.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt
@@ -2315,6 +2427,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_svn.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_tags.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_test.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_get_too_many_redirects.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_trailing_slash.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_upgrade.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_get_upgrade_pseudo.txt
@@ -2325,12 +2438,14 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_go_version_mixed.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_gobuild_import.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_gofmt_invalid.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_gomodcache.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_gonoproxy.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_gopkg_unstable.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_goroot_errors.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_graph.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_help.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_import.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_import_cycle.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_import_mod.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_import_v1suffix.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_in_testdata_dir.txt
@@ -2360,6 +2475,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_load_badchain.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_load_badmod.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_load_badzip.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_load_replace_mismatch.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_local_replace.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_missing_repo.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_missingpkg_prerelease.txt
@@ -2396,6 +2512,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_sumdb_golang.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_sumdb_proxy.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_symlink.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_tagged_import_cycle.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_test.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_test_cached.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_test_files.txt
@@ -2414,6 +2531,7 @@
 #usr/lib/go/src/cmd/go/testdata/script/mod_vendor_replace.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_vendor_trimpath.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_vendor_unused.txt
+#usr/lib/go/src/cmd/go/testdata/script/mod_vendor_unused_only.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_verify.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_versions.txt
 #usr/lib/go/src/cmd/go/testdata/script/mod_why.txt
@@ -2421,249 +2539,106 @@
 #usr/lib/go/src/cmd/go/testdata/script/noncanonical_import.txt
 #usr/lib/go/src/cmd/go/testdata/script/pattern_syntax_error.txt
 #usr/lib/go/src/cmd/go/testdata/script/prevent_sys_unix_import.txt
+#usr/lib/go/src/cmd/go/testdata/script/run_dirs.txt
 #usr/lib/go/src/cmd/go/testdata/script/run_hello.txt
 #usr/lib/go/src/cmd/go/testdata/script/run_hello_pkg.txt
 #usr/lib/go/src/cmd/go/testdata/script/run_internal.txt
+#usr/lib/go/src/cmd/go/testdata/script/run_issue11709.txt
 #usr/lib/go/src/cmd/go/testdata/script/run_set_executable_name.txt
+#usr/lib/go/src/cmd/go/testdata/script/run_vendor.txt
 #usr/lib/go/src/cmd/go/testdata/script/run_wildcard.txt
 #usr/lib/go/src/cmd/go/testdata/script/script_wait.txt
 #usr/lib/go/src/cmd/go/testdata/script/std_vendor.txt
 #usr/lib/go/src/cmd/go/testdata/script/sum_readonly.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_bad_example.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_badtest.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_benchmark_chatty_fail.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_benchmark_chatty_success.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_benchmark_fatal.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_benchmark_labels.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_benchmark_timeout.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_build_failure.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_cache_inputs.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_chatty_fail.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_chatty_parallel_fail.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_chatty_parallel_success.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_chatty_parallel_success_sleepy.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_chatty_success.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_compile_binary.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_compile_tempfile.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_deadline.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_empty.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_env_term.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_fail_fast.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_flag.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_flags.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_generated_main.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_go111module_cache.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_import_error_stack.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_json.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_json_exit.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_json_interleaved.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_json_panic_exit.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_main.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_main_archive.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_main_panic.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_main_twice.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_benchmark_labels.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_no_benchmarks.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_no_subtests.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_no_subtests_failure.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_no_subtests_parallel.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_no_tests.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_match_no_tests_build_failure.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_no_tests_with_subtests.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_only_benchmarks.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_only_example.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_only_subtests.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_only_subtests_parallel.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_match_only_tests.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_minus_n.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_no_run_example.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_no_tests.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_parallel_number.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_profile.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_race.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_race_cover_mode_issue20435.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_race_install.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_race_install_cgo.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_rebuildall.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_regexps.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_relative_cmdline.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_relative_import.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_relative_import_dash_i.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_source_order.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_status.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_syntax_error_says_fail.txt
 #usr/lib/go/src/cmd/go/testdata/script/test_timeout.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_vendor.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_vet.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_write_profiles_on_timeout.txt
+#usr/lib/go/src/cmd/go/testdata/script/test_xtestonly_works.txt
+#usr/lib/go/src/cmd/go/testdata/script/testing_issue40908.txt
 #usr/lib/go/src/cmd/go/testdata/script/vendor_complex.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_gopath_issue11409.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_import.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_import_missing.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_import_wrong.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_issue12156.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_list_issue11977.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_resolve.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_test_issue11864.txt
+#usr/lib/go/src/cmd/go/testdata/script/vendor_test_issue14613.txt
 #usr/lib/go/src/cmd/go/testdata/script/version.txt
+#usr/lib/go/src/cmd/go/testdata/script/version_replace.txt
+#usr/lib/go/src/cmd/go/testdata/script/vet.txt
 #usr/lib/go/src/cmd/go/testdata/script/vet_asm.txt
 #usr/lib/go/src/cmd/go/testdata/script/vet_deps.txt
 #usr/lib/go/src/cmd/go/testdata/script/vet_flags.txt
-#usr/lib/go/src/cmd/go/testdata/shadow
-#usr/lib/go/src/cmd/go/testdata/shadow/root1
-#usr/lib/go/src/cmd/go/testdata/shadow/root1/src
-#usr/lib/go/src/cmd/go/testdata/shadow/root1/src/foo
-#usr/lib/go/src/cmd/go/testdata/shadow/root1/src/foo/foo.go
-#usr/lib/go/src/cmd/go/testdata/shadow/root1/src/math
-#usr/lib/go/src/cmd/go/testdata/shadow/root1/src/math/math.go
-#usr/lib/go/src/cmd/go/testdata/shadow/root2
-#usr/lib/go/src/cmd/go/testdata/shadow/root2/src
-#usr/lib/go/src/cmd/go/testdata/shadow/root2/src/foo
-#usr/lib/go/src/cmd/go/testdata/shadow/root2/src/foo/foo.go
-#usr/lib/go/src/cmd/go/testdata/src
-#usr/lib/go/src/cmd/go/testdata/src/cgotest
-#usr/lib/go/src/cmd/go/testdata/src/cgotest/m.go
-#usr/lib/go/src/cmd/go/testdata/src/coverasm
-#usr/lib/go/src/cmd/go/testdata/src/coverasm/p.go
-#usr/lib/go/src/cmd/go/testdata/src/coverasm/p.s
-#usr/lib/go/src/cmd/go/testdata/src/coverasm/p_test.go
-#usr/lib/go/src/cmd/go/testdata/src/coverbad
-#usr/lib/go/src/cmd/go/testdata/src/coverbad/p.go
-#usr/lib/go/src/cmd/go/testdata/src/coverbad/p1.go
-#usr/lib/go/src/cmd/go/testdata/src/coverbad/p_test.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdep
-#usr/lib/go/src/cmd/go/testdata/src/coverdep/p.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdep/p1
-#usr/lib/go/src/cmd/go/testdata/src/coverdep/p1/p1.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdep/p_test.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdep2
-#usr/lib/go/src/cmd/go/testdata/src/coverdep2/p1
-#usr/lib/go/src/cmd/go/testdata/src/coverdep2/p1/p.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdep2/p1/p_test.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdep2/p2
-#usr/lib/go/src/cmd/go/testdata/src/coverdep2/p2/p2.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdot1
-#usr/lib/go/src/cmd/go/testdata/src/coverdot1/p.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdot2
-#usr/lib/go/src/cmd/go/testdata/src/coverdot2/p.go
-#usr/lib/go/src/cmd/go/testdata/src/coverdot2/p_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkg
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkg/pkg.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtest
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtest/pkg.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtest/test_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtestxtest
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtestxtest/pkg.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtestxtest/test_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgtestxtest/xtest_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgxtest
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgxtest/pkg.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/pkgxtest/xtest_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/test
-#usr/lib/go/src/cmd/go/testdata/src/empty/test/test_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/testxtest
-#usr/lib/go/src/cmd/go/testdata/src/empty/testxtest/test_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/testxtest/xtest_test.go
-#usr/lib/go/src/cmd/go/testdata/src/empty/xtest
-#usr/lib/go/src/cmd/go/testdata/src/empty/xtest/xtest_test.go
-#usr/lib/go/src/cmd/go/testdata/src/exclude
-#usr/lib/go/src/cmd/go/testdata/src/exclude/empty
-#usr/lib/go/src/cmd/go/testdata/src/exclude/empty/x.txt
-#usr/lib/go/src/cmd/go/testdata/src/exclude/ignore
-#usr/lib/go/src/cmd/go/testdata/src/exclude/ignore/_x.go
-#usr/lib/go/src/cmd/go/testdata/src/exclude/x.go
-#usr/lib/go/src/cmd/go/testdata/src/exclude/x_linux.go
-#usr/lib/go/src/cmd/go/testdata/src/failfast_test.go
-#usr/lib/go/src/cmd/go/testdata/src/hello
-#usr/lib/go/src/cmd/go/testdata/src/hello/hello.go
-#usr/lib/go/src/cmd/go/testdata/src/my.pkg
-#usr/lib/go/src/cmd/go/testdata/src/my.pkg/main
-#usr/lib/go/src/cmd/go/testdata/src/my.pkg/main/main.go
-#usr/lib/go/src/cmd/go/testdata/src/my.pkg/pkg.go
-#usr/lib/go/src/cmd/go/testdata/src/skipper
-#usr/lib/go/src/cmd/go/testdata/src/skipper/skip_test.go
-#usr/lib/go/src/cmd/go/testdata/src/testlist
-#usr/lib/go/src/cmd/go/testdata/src/testlist/bench_test.go
-#usr/lib/go/src/cmd/go/testdata/src/testlist/example_test.go
-#usr/lib/go/src/cmd/go/testdata/src/testlist/test_test.go
-#usr/lib/go/src/cmd/go/testdata/src/vend
-#usr/lib/go/src/cmd/go/testdata/src/vend/bad.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/dir1
-#usr/lib/go/src/cmd/go/testdata/src/vend/dir1/dir1.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/good.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/hello
-#usr/lib/go/src/cmd/go/testdata/src/vend/hello/hello.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/hello/hello_test.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/hello/hellox_test.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/subdir
-#usr/lib/go/src/cmd/go/testdata/src/vend/subdir/bad.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/subdir/good.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/p
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/p/p.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/q
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/q/q.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/strings
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/strings/msg.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/vend
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/vend/dir1
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/vend/dir1/dir2
-#usr/lib/go/src/cmd/go/testdata/src/vend/vendor/vend/dir1/dir2/dir2.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/x
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/invalid
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/invalid/invalid.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor/p
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor/p/p
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor/p/p.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor/p/p/p.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor/r
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/vendor/r/r.go
-#usr/lib/go/src/cmd/go/testdata/src/vend/x/x.go
-#usr/lib/go/src/cmd/go/testdata/src/vetcycle
-#usr/lib/go/src/cmd/go/testdata/src/vetcycle/p.go
-#usr/lib/go/src/cmd/go/testdata/src/vetfail
-#usr/lib/go/src/cmd/go/testdata/src/vetfail/p1
-#usr/lib/go/src/cmd/go/testdata/src/vetfail/p1/p1.go
-#usr/lib/go/src/cmd/go/testdata/src/vetfail/p2
-#usr/lib/go/src/cmd/go/testdata/src/vetfail/p2/p2.go
-#usr/lib/go/src/cmd/go/testdata/src/vetfail/p2/p2_test.go
-#usr/lib/go/src/cmd/go/testdata/src/vetpkg
-#usr/lib/go/src/cmd/go/testdata/src/vetpkg/a_test.go
-#usr/lib/go/src/cmd/go/testdata/src/vetpkg/b.go
-#usr/lib/go/src/cmd/go/testdata/src/vetpkg/c.go
-#usr/lib/go/src/cmd/go/testdata/src/xtestonly
-#usr/lib/go/src/cmd/go/testdata/src/xtestonly/f.go
-#usr/lib/go/src/cmd/go/testdata/src/xtestonly/f_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_benchmark_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_fail_sub_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_main_normal_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_main_wrong_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_parallel_sub_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_sub_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_test.go
-#usr/lib/go/src/cmd/go/testdata/standalone_testmain_flag_test.go
-#usr/lib/go/src/cmd/go/testdata/testcover
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg1
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg1/a.go
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg2
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg2/a.go
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg2/a_test.go
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg3
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg3/a.go
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg3/a_test.go
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg4
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg4/a.go
-#usr/lib/go/src/cmd/go/testdata/testcover/pkg4/a_test.go
-#usr/lib/go/src/cmd/go/testdata/testimport
-#usr/lib/go/src/cmd/go/testdata/testimport/p.go
-#usr/lib/go/src/cmd/go/testdata/testimport/p1
-#usr/lib/go/src/cmd/go/testdata/testimport/p1/p1.go
-#usr/lib/go/src/cmd/go/testdata/testimport/p2
-#usr/lib/go/src/cmd/go/testdata/testimport/p2/p2.go
-#usr/lib/go/src/cmd/go/testdata/testimport/p_test.go
-#usr/lib/go/src/cmd/go/testdata/testimport/x_test.go
-#usr/lib/go/src/cmd/go/testdata/testinternal
-#usr/lib/go/src/cmd/go/testdata/testinternal/p.go
-#usr/lib/go/src/cmd/go/testdata/testinternal2
-#usr/lib/go/src/cmd/go/testdata/testinternal2/p.go
-#usr/lib/go/src/cmd/go/testdata/testinternal2/x
-#usr/lib/go/src/cmd/go/testdata/testinternal2/x/y
-#usr/lib/go/src/cmd/go/testdata/testinternal2/x/y/z
-#usr/lib/go/src/cmd/go/testdata/testinternal2/x/y/z/internal
-#usr/lib/go/src/cmd/go/testdata/testinternal2/x/y/z/internal/w
-#usr/lib/go/src/cmd/go/testdata/testinternal2/x/y/z/internal/w/w.go
-#usr/lib/go/src/cmd/go/testdata/testinternal3
-#usr/lib/go/src/cmd/go/testdata/testinternal3/t.go
-#usr/lib/go/src/cmd/go/testdata/testinternal4
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/p
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/p/p.go
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/q
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/q/internal
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/q/internal/x
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/q/internal/x/x.go
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/q/j
-#usr/lib/go/src/cmd/go/testdata/testinternal4/src/q/j/j.go
-#usr/lib/go/src/cmd/go/testdata/testonly
-#usr/lib/go/src/cmd/go/testdata/testonly/p_test.go
-#usr/lib/go/src/cmd/go/testdata/testonly2
-#usr/lib/go/src/cmd/go/testdata/testonly2/t.go
+#usr/lib/go/src/cmd/go/testdata/script/vet_internal.txt
 #usr/lib/go/src/cmd/go/testdata/testterminal18153
 #usr/lib/go/src/cmd/go/testdata/testterminal18153/terminal_test.go
-#usr/lib/go/src/cmd/go/testdata/testvendor
-#usr/lib/go/src/cmd/go/testdata/testvendor/src
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/p
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/p/p.go
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/vendor
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/vendor/x
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/vendor/x/x.go
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/y
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/y/y.go
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/z
-#usr/lib/go/src/cmd/go/testdata/testvendor/src/q/z/z.go
-#usr/lib/go/src/cmd/go/testdata/testvendor2
-#usr/lib/go/src/cmd/go/testdata/testvendor2/src
-#usr/lib/go/src/cmd/go/testdata/testvendor2/src/p
-#usr/lib/go/src/cmd/go/testdata/testvendor2/src/p/p.go
-#usr/lib/go/src/cmd/go/testdata/testvendor2/vendor
-#usr/lib/go/src/cmd/go/testdata/testvendor2/vendor/x
-#usr/lib/go/src/cmd/go/testdata/testvendor2/vendor/x/x.go
-#usr/lib/go/src/cmd/go/testdata/timeoutbench_test.go
 #usr/lib/go/src/cmd/go/testdata/vendormod.txt
-#usr/lib/go/src/cmd/go/vendor_test.go
 #usr/lib/go/src/cmd/gofmt
 #usr/lib/go/src/cmd/gofmt/doc.go
 #usr/lib/go/src/cmd/gofmt/gofmt.go
@@ -2777,6 +2752,9 @@
 #usr/lib/go/src/cmd/internal/goobj2/funcinfo.go
 #usr/lib/go/src/cmd/internal/goobj2/mkbuiltin.go
 #usr/lib/go/src/cmd/internal/goobj2/objfile.go
+#usr/lib/go/src/cmd/internal/goobj2/objfile_test.go
+#usr/lib/go/src/cmd/internal/moddeps
+#usr/lib/go/src/cmd/internal/moddeps/moddeps_test.go
 #usr/lib/go/src/cmd/internal/obj
 #usr/lib/go/src/cmd/internal/obj/abi_string.go
 #usr/lib/go/src/cmd/internal/obj/addrtype_string.go
@@ -2822,6 +2800,7 @@
 #usr/lib/go/src/cmd/internal/obj/ppc64/anames.go
 #usr/lib/go/src/cmd/internal/obj/ppc64/anames9.go
 #usr/lib/go/src/cmd/internal/obj/ppc64/asm9.go
+#usr/lib/go/src/cmd/internal/obj/ppc64/asm_test.go
 #usr/lib/go/src/cmd/internal/obj/ppc64/doc.go
 #usr/lib/go/src/cmd/internal/obj/ppc64/list9.go
 #usr/lib/go/src/cmd/internal/obj/ppc64/obj9.go
@@ -2832,6 +2811,10 @@
 #usr/lib/go/src/cmd/internal/obj/riscv/inst.go
 #usr/lib/go/src/cmd/internal/obj/riscv/list.go
 #usr/lib/go/src/cmd/internal/obj/riscv/obj.go
+#usr/lib/go/src/cmd/internal/obj/riscv/testdata
+#usr/lib/go/src/cmd/internal/obj/riscv/testdata/testbranch
+#usr/lib/go/src/cmd/internal/obj/riscv/testdata/testbranch/branch_test.go
+#usr/lib/go/src/cmd/internal/obj/riscv/testdata/testbranch/branch_test.s
 #usr/lib/go/src/cmd/internal/obj/s390x
 #usr/lib/go/src/cmd/internal/obj/s390x/a.out.go
 #usr/lib/go/src/cmd/internal/obj/s390x/anames.go
@@ -2918,6 +2901,8 @@
 #usr/lib/go/src/cmd/internal/test2json/testdata/issue23036.test
 #usr/lib/go/src/cmd/internal/test2json/testdata/issue23920.json
 #usr/lib/go/src/cmd/internal/test2json/testdata/issue23920.test
+#usr/lib/go/src/cmd/internal/test2json/testdata/issue29755.json
+#usr/lib/go/src/cmd/internal/test2json/testdata/issue29755.test
 #usr/lib/go/src/cmd/internal/test2json/testdata/panic.json
 #usr/lib/go/src/cmd/internal/test2json/testdata/panic.test
 #usr/lib/go/src/cmd/internal/test2json/testdata/smiley.json
@@ -2943,19 +2928,27 @@
 #usr/lib/go/src/cmd/link/internal/arm64/asm.go
 #usr/lib/go/src/cmd/link/internal/arm64/l.go
 #usr/lib/go/src/cmd/link/internal/arm64/obj.go
+#usr/lib/go/src/cmd/link/internal/benchmark
+#usr/lib/go/src/cmd/link/internal/benchmark/bench.go
+#usr/lib/go/src/cmd/link/internal/benchmark/bench_test.go
 #usr/lib/go/src/cmd/link/internal/ld
 #usr/lib/go/src/cmd/link/internal/ld/ar.go
 #usr/lib/go/src/cmd/link/internal/ld/config.go
 #usr/lib/go/src/cmd/link/internal/ld/data.go
+#usr/lib/go/src/cmd/link/internal/ld/data2.go
 #usr/lib/go/src/cmd/link/internal/ld/deadcode.go
-#usr/lib/go/src/cmd/link/internal/ld/deadcode2.go
+#usr/lib/go/src/cmd/link/internal/ld/deadcode_test.go
 #usr/lib/go/src/cmd/link/internal/ld/decodesym.go
 #usr/lib/go/src/cmd/link/internal/ld/dwarf.go
+#usr/lib/go/src/cmd/link/internal/ld/dwarf2.go
 #usr/lib/go/src/cmd/link/internal/ld/dwarf_test.go
 #usr/lib/go/src/cmd/link/internal/ld/elf.go
+#usr/lib/go/src/cmd/link/internal/ld/elf2.go
 #usr/lib/go/src/cmd/link/internal/ld/elf_test.go
+#usr/lib/go/src/cmd/link/internal/ld/errors.go
 #usr/lib/go/src/cmd/link/internal/ld/execarchive.go
 #usr/lib/go/src/cmd/link/internal/ld/execarchive_noexec.go
+#usr/lib/go/src/cmd/link/internal/ld/fallocate_test.go
 #usr/lib/go/src/cmd/link/internal/ld/go.go
 #usr/lib/go/src/cmd/link/internal/ld/issue33808_test.go
 #usr/lib/go/src/cmd/link/internal/ld/ld.go
@@ -2967,14 +2960,22 @@
 #usr/lib/go/src/cmd/link/internal/ld/main.go
 #usr/lib/go/src/cmd/link/internal/ld/nooptcgolink_test.go
 #usr/lib/go/src/cmd/link/internal/ld/outbuf.go
+#usr/lib/go/src/cmd/link/internal/ld/outbuf_darwin.go
+#usr/lib/go/src/cmd/link/internal/ld/outbuf_linux.go
 #usr/lib/go/src/cmd/link/internal/ld/outbuf_mmap.go
+#usr/lib/go/src/cmd/link/internal/ld/outbuf_nofallocate.go
 #usr/lib/go/src/cmd/link/internal/ld/outbuf_nommap.go
+#usr/lib/go/src/cmd/link/internal/ld/outbuf_test.go
 #usr/lib/go/src/cmd/link/internal/ld/outbuf_windows.go
 #usr/lib/go/src/cmd/link/internal/ld/pcln.go
 #usr/lib/go/src/cmd/link/internal/ld/pe.go
 #usr/lib/go/src/cmd/link/internal/ld/sym.go
 #usr/lib/go/src/cmd/link/internal/ld/symtab.go
+#usr/lib/go/src/cmd/link/internal/ld/target.go
 #usr/lib/go/src/cmd/link/internal/ld/testdata
+#usr/lib/go/src/cmd/link/internal/ld/testdata/deadcode
+#usr/lib/go/src/cmd/link/internal/ld/testdata/deadcode/reflectcall.go
+#usr/lib/go/src/cmd/link/internal/ld/testdata/deadcode/typedesc.go
 #usr/lib/go/src/cmd/link/internal/ld/testdata/httptest
 #usr/lib/go/src/cmd/link/internal/ld/testdata/httptest/main
 #usr/lib/go/src/cmd/link/internal/ld/testdata/httptest/main/main.go
@@ -2997,13 +2998,21 @@
 #usr/lib/go/src/cmd/link/internal/ld/testdata/issue32233/lib/lib.go
 #usr/lib/go/src/cmd/link/internal/ld/testdata/issue32233/main
 #usr/lib/go/src/cmd/link/internal/ld/testdata/issue32233/main/main.go
+#usr/lib/go/src/cmd/link/internal/ld/testdata/issue38192
+#usr/lib/go/src/cmd/link/internal/ld/testdata/issue38192/main.go
+#usr/lib/go/src/cmd/link/internal/ld/testdata/issue38192/oneline.s
+#usr/lib/go/src/cmd/link/internal/ld/testdata/issue39757
+#usr/lib/go/src/cmd/link/internal/ld/testdata/issue39757/issue39757main.go
 #usr/lib/go/src/cmd/link/internal/ld/typelink.go
 #usr/lib/go/src/cmd/link/internal/ld/util.go
 #usr/lib/go/src/cmd/link/internal/ld/xcoff.go
+#usr/lib/go/src/cmd/link/internal/ld/xcoff2.go
 #usr/lib/go/src/cmd/link/internal/loadelf
 #usr/lib/go/src/cmd/link/internal/loadelf/ldelf.go
 #usr/lib/go/src/cmd/link/internal/loader
 #usr/lib/go/src/cmd/link/internal/loader/loader.go
+#usr/lib/go/src/cmd/link/internal/loader/loader_test.go
+#usr/lib/go/src/cmd/link/internal/loader/symbolbuilder.go
 #usr/lib/go/src/cmd/link/internal/loadmacho
 #usr/lib/go/src/cmd/link/internal/loadmacho/ldmacho.go
 #usr/lib/go/src/cmd/link/internal/loadpe
@@ -3018,8 +3027,6 @@
 #usr/lib/go/src/cmd/link/internal/mips64/asm.go
 #usr/lib/go/src/cmd/link/internal/mips64/l.go
 #usr/lib/go/src/cmd/link/internal/mips64/obj.go
-#usr/lib/go/src/cmd/link/internal/objfile
-#usr/lib/go/src/cmd/link/internal/objfile/objfile.go
 #usr/lib/go/src/cmd/link/internal/ppc64
 #usr/lib/go/src/cmd/link/internal/ppc64/asm.go
 #usr/lib/go/src/cmd/link/internal/ppc64/l.go
@@ -3054,8 +3061,16 @@
 #usr/lib/go/src/cmd/link/linkbig_test.go
 #usr/lib/go/src/cmd/link/main.go
 #usr/lib/go/src/cmd/link/testdata
-#usr/lib/go/src/cmd/link/testdata/lib.go
-#usr/lib/go/src/cmd/link/testdata/main.m
+#usr/lib/go/src/cmd/link/testdata/testBuildFortvOS
+#usr/lib/go/src/cmd/link/testdata/testBuildFortvOS/lib.go
+#usr/lib/go/src/cmd/link/testdata/testBuildFortvOS/main.m
+#usr/lib/go/src/cmd/link/testdata/testIndexMismatch
+#usr/lib/go/src/cmd/link/testdata/testIndexMismatch/a.go
+#usr/lib/go/src/cmd/link/testdata/testIndexMismatch/b.go
+#usr/lib/go/src/cmd/link/testdata/testIndexMismatch/main.go
+#usr/lib/go/src/cmd/link/testdata/testPErsrc
+#usr/lib/go/src/cmd/link/testdata/testPErsrc/main.go
+#usr/lib/go/src/cmd/link/testdata/testPErsrc/rsrc.syso
 #usr/lib/go/src/cmd/nm
 #usr/lib/go/src/cmd/nm/doc.go
 #usr/lib/go/src/cmd/nm/nm.go
@@ -3066,6 +3081,124 @@
 #usr/lib/go/src/cmd/objdump/objdump_test.go
 #usr/lib/go/src/cmd/objdump/testdata
 #usr/lib/go/src/cmd/objdump/testdata/fmthello.go
+#usr/lib/go/src/cmd/oldlink
+#usr/lib/go/src/cmd/oldlink/doc.go
+#usr/lib/go/src/cmd/oldlink/internal
+#usr/lib/go/src/cmd/oldlink/internal/amd64
+#usr/lib/go/src/cmd/oldlink/internal/amd64/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/amd64/l.go
+#usr/lib/go/src/cmd/oldlink/internal/amd64/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/arm
+#usr/lib/go/src/cmd/oldlink/internal/arm/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/arm/l.go
+#usr/lib/go/src/cmd/oldlink/internal/arm/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/arm64
+#usr/lib/go/src/cmd/oldlink/internal/arm64/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/arm64/l.go
+#usr/lib/go/src/cmd/oldlink/internal/arm64/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/ld
+#usr/lib/go/src/cmd/oldlink/internal/ld/ar.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/config.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/data.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/deadcode.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/deadcode2.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/decodesym.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/dwarf.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/elf.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/execarchive.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/execarchive_noexec.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/go.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/ld.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/lib.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/link.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/macho.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/macho_combine_dwarf.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/main.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/outbuf.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/outbuf_mmap.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/outbuf_nommap.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/outbuf_windows.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/pcln.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/pe.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/sym.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/symtab.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/httptest
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/httptest/main
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/httptest/main/main.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue10978
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue10978/main.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue10978/main.s
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue25459
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue25459/a
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue25459/a/a.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue25459/main
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue25459/main/main.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue26237
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue26237/b.dir
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue26237/b.dir/b.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue26237/main
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue26237/main/main.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue32233
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue32233/lib
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue32233/lib/ObjC.m
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue32233/lib/lib.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue32233/main
+#usr/lib/go/src/cmd/oldlink/internal/ld/testdata/issue32233/main/main.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/typelink.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/util.go
+#usr/lib/go/src/cmd/oldlink/internal/ld/xcoff.go
+#usr/lib/go/src/cmd/oldlink/internal/loadelf
+#usr/lib/go/src/cmd/oldlink/internal/loadelf/ldelf.go
+#usr/lib/go/src/cmd/oldlink/internal/loader
+#usr/lib/go/src/cmd/oldlink/internal/loader/loader.go
+#usr/lib/go/src/cmd/oldlink/internal/loadmacho
+#usr/lib/go/src/cmd/oldlink/internal/loadmacho/ldmacho.go
+#usr/lib/go/src/cmd/oldlink/internal/loadpe
+#usr/lib/go/src/cmd/oldlink/internal/loadpe/ldpe.go
+#usr/lib/go/src/cmd/oldlink/internal/loadxcoff
+#usr/lib/go/src/cmd/oldlink/internal/loadxcoff/ldxcoff.go
+#usr/lib/go/src/cmd/oldlink/internal/mips
+#usr/lib/go/src/cmd/oldlink/internal/mips/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/mips/l.go
+#usr/lib/go/src/cmd/oldlink/internal/mips/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/mips64
+#usr/lib/go/src/cmd/oldlink/internal/mips64/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/mips64/l.go
+#usr/lib/go/src/cmd/oldlink/internal/mips64/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/objfile
+#usr/lib/go/src/cmd/oldlink/internal/objfile/objfile.go
+#usr/lib/go/src/cmd/oldlink/internal/ppc64
+#usr/lib/go/src/cmd/oldlink/internal/ppc64/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/ppc64/l.go
+#usr/lib/go/src/cmd/oldlink/internal/ppc64/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/riscv64
+#usr/lib/go/src/cmd/oldlink/internal/riscv64/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/riscv64/l.go
+#usr/lib/go/src/cmd/oldlink/internal/riscv64/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/s390x
+#usr/lib/go/src/cmd/oldlink/internal/s390x/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/s390x/l.go
+#usr/lib/go/src/cmd/oldlink/internal/s390x/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/sym
+#usr/lib/go/src/cmd/oldlink/internal/sym/attribute.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/compilation_unit.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/library.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/reloc.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/segment.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/sizeof_test.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/symbol.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/symbols.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/symkind.go
+#usr/lib/go/src/cmd/oldlink/internal/sym/symkind_string.go
+#usr/lib/go/src/cmd/oldlink/internal/wasm
+#usr/lib/go/src/cmd/oldlink/internal/wasm/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/wasm/obj.go
+#usr/lib/go/src/cmd/oldlink/internal/x86
+#usr/lib/go/src/cmd/oldlink/internal/x86/asm.go
+#usr/lib/go/src/cmd/oldlink/internal/x86/l.go
+#usr/lib/go/src/cmd/oldlink/internal/x86/obj.go
+#usr/lib/go/src/cmd/oldlink/main.go
 #usr/lib/go/src/cmd/pack
 #usr/lib/go/src/cmd/pack/doc.go
 #usr/lib/go/src/cmd/pack/pack.go
@@ -3265,6 +3398,9 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/CONTRIBUTORS
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/LICENSE
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/PATENTS
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/internal
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/internal/unsafeheader
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/.gitignore
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/README.md
@@ -3316,9 +3452,11 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/fcntl.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/fcntl_darwin.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/fdset.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/gccgo.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/gccgo_c.c
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
@@ -3329,18 +3467,28 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/pledge_openbsd.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/race.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/race0.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/readdirent_getdents.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/str.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_aix.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_bsd.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_386.1_11.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.1_11.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.1_11.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -3350,6 +3498,7 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_illumos.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux_386.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -3395,6 +3544,7 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -3417,24 +3567,33 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptrace386_linux.go
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptracearm_linux.go
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptracemips_linux.go
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_13.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_13.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_13.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_13.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -3442,6 +3601,8 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_linux.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -3509,6 +3670,7 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -3533,16 +3695,14 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/aliases.go
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/asm_windows_386.s
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/asm_windows_amd64.s
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/asm_windows_arm.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/dll_windows.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/empty.s
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/env_windows.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/eventlog.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/exec_windows.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/memory_windows.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/mkerrors.bash
-#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/mkerrors.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/mkknownfolderids.bash
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/mksyscall.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/race.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/race0.go
@@ -3556,6 +3716,7 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/types_windows_amd64.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/types_windows_arm.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/zerrors_windows.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/zknownfolderids_windows.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/sys/windows/zsyscall_windows.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/AUTHORS
@@ -3598,6 +3759,8 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/errorsas/errorsas.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/httpresponse
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/httpresponse/httpresponse.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/ifaceassert
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/ifaceassert/ifaceassert.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/inspect
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/inspect/inspect.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/internal
@@ -3617,6 +3780,8 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/shift/shift.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/stdmethods
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/stdmethods/stdmethods.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/stringintconv
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/stringintconv/string.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/structtag
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/structtag/structtag.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/tests
@@ -3654,6 +3819,9 @@
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/types/typeutil/map.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/types/typeutil/methodsetcache.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/tools/go/types/typeutil/ui.go
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/internal
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/internal/analysisinternal
+#usr/lib/go/src/cmd/vendor/golang.org/x/tools/internal/analysisinternal/analysis.go
 #usr/lib/go/src/cmd/vendor/golang.org/x/xerrors
 #usr/lib/go/src/cmd/vendor/golang.org/x/xerrors/LICENSE
 #usr/lib/go/src/cmd/vendor/golang.org/x/xerrors/PATENTS
@@ -3916,7 +4084,12 @@
 #usr/lib/go/src/crypto/dsa/dsa_test.go
 #usr/lib/go/src/crypto/ecdsa
 #usr/lib/go/src/crypto/ecdsa/ecdsa.go
+#usr/lib/go/src/crypto/ecdsa/ecdsa_noasm.go
+#usr/lib/go/src/crypto/ecdsa/ecdsa_s390x.go
+#usr/lib/go/src/crypto/ecdsa/ecdsa_s390x.s
+#usr/lib/go/src/crypto/ecdsa/ecdsa_s390x_test.go
 #usr/lib/go/src/crypto/ecdsa/ecdsa_test.go
+#usr/lib/go/src/crypto/ecdsa/equal_test.go
 #usr/lib/go/src/crypto/ecdsa/example_test.go
 #usr/lib/go/src/crypto/ecdsa/testdata
 #usr/lib/go/src/crypto/ecdsa/testdata/SigVer.rsp.bz2
@@ -3988,6 +4161,7 @@
 #usr/lib/go/src/crypto/rc4/rc4.go
 #usr/lib/go/src/crypto/rc4/rc4_test.go
 #usr/lib/go/src/crypto/rsa
+#usr/lib/go/src/crypto/rsa/equal_test.go
 #usr/lib/go/src/crypto/rsa/example_test.go
 #usr/lib/go/src/crypto/rsa/pkcs1v15.go
 #usr/lib/go/src/crypto/rsa/pkcs1v15_test.go
@@ -4051,6 +4225,7 @@
 #usr/lib/go/src/crypto/tls/auth_test.go
 #usr/lib/go/src/crypto/tls/cipher_suites.go
 #usr/lib/go/src/crypto/tls/common.go
+#usr/lib/go/src/crypto/tls/common_string.go
 #usr/lib/go/src/crypto/tls/conn.go
 #usr/lib/go/src/crypto/tls/conn_test.go
 #usr/lib/go/src/crypto/tls/example_test.go
@@ -4068,6 +4243,7 @@
 #usr/lib/go/src/crypto/tls/key_agreement.go
 #usr/lib/go/src/crypto/tls/key_schedule.go
 #usr/lib/go/src/crypto/tls/key_schedule_test.go
+#usr/lib/go/src/crypto/tls/link_test.go
 #usr/lib/go/src/crypto/tls/prf.go
 #usr/lib/go/src/crypto/tls/prf_test.go
 #usr/lib/go/src/crypto/tls/testdata
@@ -4196,6 +4372,12 @@
 #usr/lib/go/src/crypto/x509
 #usr/lib/go/src/crypto/x509/cert_pool.go
 #usr/lib/go/src/crypto/x509/example_test.go
+#usr/lib/go/src/crypto/x509/internal
+#usr/lib/go/src/crypto/x509/internal/macos
+#usr/lib/go/src/crypto/x509/internal/macos/corefoundation.go
+#usr/lib/go/src/crypto/x509/internal/macos/corefoundation.s
+#usr/lib/go/src/crypto/x509/internal/macos/security.go
+#usr/lib/go/src/crypto/x509/internal/macos/security.s
 #usr/lib/go/src/crypto/x509/name_constraints_test.go
 #usr/lib/go/src/crypto/x509/pem_decrypt.go
 #usr/lib/go/src/crypto/x509/pem_decrypt_test.go
@@ -4207,14 +4389,15 @@
 #usr/lib/go/src/crypto/x509/root.go
 #usr/lib/go/src/crypto/x509/root_aix.go
 #usr/lib/go/src/crypto/x509/root_bsd.go
-#usr/lib/go/src/crypto/x509/root_cgo_darwin.go
-#usr/lib/go/src/crypto/x509/root_darwin.go
-#usr/lib/go/src/crypto/x509/root_darwin_arm_gen.go
-#usr/lib/go/src/crypto/x509/root_darwin_armx.go
+#usr/lib/go/src/crypto/x509/root_cgo_darwin_amd64.go
+#usr/lib/go/src/crypto/x509/root_darwin_amd64.go
+#usr/lib/go/src/crypto/x509/root_darwin_ios.go
+#usr/lib/go/src/crypto/x509/root_darwin_ios_gen.go
 #usr/lib/go/src/crypto/x509/root_darwin_test.go
 #usr/lib/go/src/crypto/x509/root_js.go
 #usr/lib/go/src/crypto/x509/root_linux.go
-#usr/lib/go/src/crypto/x509/root_nocgo_darwin.go
+#usr/lib/go/src/crypto/x509/root_omit.go
+#usr/lib/go/src/crypto/x509/root_omit_test.go
 #usr/lib/go/src/crypto/x509/root_plan9.go
 #usr/lib/go/src/crypto/x509/root_solaris.go
 #usr/lib/go/src/crypto/x509/root_unix.go
@@ -4694,11 +4877,11 @@
 #usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
 #usr/lib/go/src/go/internal/gccgoimporter/testdata/v1reflect.gox
 #usr/lib/go/src/go/internal/gcimporter
-#usr/lib/go/src/go/internal/gcimporter/bimport.go
 #usr/lib/go/src/go/internal/gcimporter/exportdata.go
 #usr/lib/go/src/go/internal/gcimporter/gcimporter.go
 #usr/lib/go/src/go/internal/gcimporter/gcimporter_test.go
 #usr/lib/go/src/go/internal/gcimporter/iimport.go
+#usr/lib/go/src/go/internal/gcimporter/support.go
 #usr/lib/go/src/go/internal/gcimporter/testdata
 #usr/lib/go/src/go/internal/gcimporter/testdata/a.go
 #usr/lib/go/src/go/internal/gcimporter/testdata/b.go
@@ -4765,6 +4948,9 @@
 #usr/lib/go/src/go/printer/testdata/expressions.golden
 #usr/lib/go/src/go/printer/testdata/expressions.input
 #usr/lib/go/src/go/printer/testdata/expressions.raw
+#usr/lib/go/src/go/printer/testdata/go2numbers.golden
+#usr/lib/go/src/go/printer/testdata/go2numbers.input
+#usr/lib/go/src/go/printer/testdata/go2numbers.norm
 #usr/lib/go/src/go/printer/testdata/linebreaks.golden
 #usr/lib/go/src/go/printer/testdata/linebreaks.input
 #usr/lib/go/src/go/printer/testdata/parser.go
@@ -4912,6 +5098,7 @@
 #usr/lib/go/src/hash/fnv/fnv_test.go
 #usr/lib/go/src/hash/hash.go
 #usr/lib/go/src/hash/maphash
+#usr/lib/go/src/hash/maphash/example_test.go
 #usr/lib/go/src/hash/maphash/maphash.go
 #usr/lib/go/src/hash/maphash/maphash_test.go
 #usr/lib/go/src/hash/maphash/smhasher_test.go
@@ -4942,14 +5129,21 @@
 #usr/lib/go/src/html/template/escape_test.go
 #usr/lib/go/src/html/template/example_test.go
 #usr/lib/go/src/html/template/examplefiles_test.go
+#usr/lib/go/src/html/template/exec_test.go
 #usr/lib/go/src/html/template/html.go
 #usr/lib/go/src/html/template/html_test.go
 #usr/lib/go/src/html/template/js.go
 #usr/lib/go/src/html/template/js_test.go
 #usr/lib/go/src/html/template/jsctx_string.go
+#usr/lib/go/src/html/template/multi_test.go
 #usr/lib/go/src/html/template/state_string.go
 #usr/lib/go/src/html/template/template.go
 #usr/lib/go/src/html/template/template_test.go
+#usr/lib/go/src/html/template/testdata
+#usr/lib/go/src/html/template/testdata/file1.tmpl
+#usr/lib/go/src/html/template/testdata/file2.tmpl
+#usr/lib/go/src/html/template/testdata/tmpl1.tmpl
+#usr/lib/go/src/html/template/testdata/tmpl2.tmpl
 #usr/lib/go/src/html/template/transition.go
 #usr/lib/go/src/html/template/transition_test.go
 #usr/lib/go/src/html/template/url.go
@@ -5204,8 +5398,7 @@
 #usr/lib/go/src/internal/cpu/cpu_arm.go
 #usr/lib/go/src/internal/cpu/cpu_arm64.go
 #usr/lib/go/src/internal/cpu/cpu_mips.go
-#usr/lib/go/src/internal/cpu/cpu_mips64.go
-#usr/lib/go/src/internal/cpu/cpu_mips64le.go
+#usr/lib/go/src/internal/cpu/cpu_mips64x.go
 #usr/lib/go/src/internal/cpu/cpu_mipsle.go
 #usr/lib/go/src/internal/cpu/cpu_no_init.go
 #usr/lib/go/src/internal/cpu/cpu_ppc64x.go
@@ -5239,6 +5432,7 @@
 #usr/lib/go/src/internal/oserror
 #usr/lib/go/src/internal/oserror/errors.go
 #usr/lib/go/src/internal/poll
+#usr/lib/go/src/internal/poll/copy_file_range_linux.go
 #usr/lib/go/src/internal/poll/errno_unix.go
 #usr/lib/go/src/internal/poll/errno_windows.go
 #usr/lib/go/src/internal/poll/error_linux_test.go
@@ -5287,6 +5481,16 @@
 #usr/lib/go/src/internal/poll/sys_cloexec.go
 #usr/lib/go/src/internal/poll/writev.go
 #usr/lib/go/src/internal/poll/writev_test.go
+#usr/lib/go/src/internal/profile
+#usr/lib/go/src/internal/profile/encode.go
+#usr/lib/go/src/internal/profile/filter.go
+#usr/lib/go/src/internal/profile/legacy_profile.go
+#usr/lib/go/src/internal/profile/merge.go
+#usr/lib/go/src/internal/profile/profile.go
+#usr/lib/go/src/internal/profile/profile_test.go
+#usr/lib/go/src/internal/profile/proto.go
+#usr/lib/go/src/internal/profile/proto_test.go
+#usr/lib/go/src/internal/profile/prune.go
 #usr/lib/go/src/internal/race
 #usr/lib/go/src/internal/race/doc.go
 #usr/lib/go/src/internal/race/norace.go
@@ -5325,22 +5529,23 @@
 #usr/lib/go/src/internal/syscall/unix/at_sysnum_netbsd.go
 #usr/lib/go/src/internal/syscall/unix/at_sysnum_newfstatat_linux.go
 #usr/lib/go/src/internal/syscall/unix/at_sysnum_openbsd.go
+#usr/lib/go/src/internal/syscall/unix/copy_file_range_linux.go
 #usr/lib/go/src/internal/syscall/unix/fcntl_linux_32bit.go
 #usr/lib/go/src/internal/syscall/unix/getentropy_openbsd.go
 #usr/lib/go/src/internal/syscall/unix/getrandom_freebsd.go
 #usr/lib/go/src/internal/syscall/unix/getrandom_linux.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_386.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_amd64.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_arm.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_generic.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_mips64x.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_mipsx.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_ppc64x.go
-#usr/lib/go/src/internal/syscall/unix/getrandom_linux_s390x.go
 #usr/lib/go/src/internal/syscall/unix/ioctl_aix.go
 #usr/lib/go/src/internal/syscall/unix/nonblocking.go
 #usr/lib/go/src/internal/syscall/unix/nonblocking_js.go
 #usr/lib/go/src/internal/syscall/unix/nonblocking_libc.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_386.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_amd64.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_arm.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_generic.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_mips64x.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_mipsx.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_ppc64x.go
+#usr/lib/go/src/internal/syscall/unix/sysnum_linux_s390x.go
 #usr/lib/go/src/internal/syscall/windows
 #usr/lib/go/src/internal/syscall/windows/exec_windows_test.go
 #usr/lib/go/src/internal/syscall/windows/mksyscall.go
@@ -5396,6 +5601,9 @@
 #usr/lib/go/src/internal/trace/testdata/stress_start_stop_1_9_good
 #usr/lib/go/src/internal/trace/testdata/user_task_span_1_11_good
 #usr/lib/go/src/internal/trace/writer.go
+#usr/lib/go/src/internal/unsafeheader
+#usr/lib/go/src/internal/unsafeheader/unsafeheader.go
+#usr/lib/go/src/internal/unsafeheader/unsafeheader_test.go
 #usr/lib/go/src/internal/xcoff
 #usr/lib/go/src/internal/xcoff/ar.go
 #usr/lib/go/src/internal/xcoff/ar_test.go
@@ -5416,6 +5624,7 @@
 #usr/lib/go/src/io/io_test.go
 #usr/lib/go/src/io/ioutil
 #usr/lib/go/src/io/ioutil/example_test.go
+#usr/lib/go/src/io/ioutil/export_test.go
 #usr/lib/go/src/io/ioutil/ioutil.go
 #usr/lib/go/src/io/ioutil/ioutil_test.go
 #usr/lib/go/src/io/ioutil/tempfile.go
@@ -5475,6 +5684,7 @@
 #usr/lib/go/src/math/big/arith_mips64x.s
 #usr/lib/go/src/math/big/arith_mipsx.s
 #usr/lib/go/src/math/big/arith_ppc64x.s
+#usr/lib/go/src/math/big/arith_riscv64.s
 #usr/lib/go/src/math/big/arith_s390x.s
 #usr/lib/go/src/math/big/arith_s390x_test.go
 #usr/lib/go/src/math/big/arith_test.go
@@ -5502,6 +5712,7 @@
 #usr/lib/go/src/math/big/intconv_test.go
 #usr/lib/go/src/math/big/intmarsh.go
 #usr/lib/go/src/math/big/intmarsh_test.go
+#usr/lib/go/src/math/big/link_test.go
 #usr/lib/go/src/math/big/nat.go
 #usr/lib/go/src/math/big/nat_test.go
 #usr/lib/go/src/math/big/natconv.go
@@ -5537,6 +5748,7 @@
 #usr/lib/go/src/math/cmplx/conj.go
 #usr/lib/go/src/math/cmplx/example_test.go
 #usr/lib/go/src/math/cmplx/exp.go
+#usr/lib/go/src/math/cmplx/huge_test.go
 #usr/lib/go/src/math/cmplx/isinf.go
 #usr/lib/go/src/math/cmplx/isnan.go
 #usr/lib/go/src/math/cmplx/log.go
@@ -5553,6 +5765,7 @@
 #usr/lib/go/src/math/dim.go
 #usr/lib/go/src/math/dim_amd64.s
 #usr/lib/go/src/math/dim_arm64.s
+#usr/lib/go/src/math/dim_riscv64.s
 #usr/lib/go/src/math/dim_s390x.s
 #usr/lib/go/src/math/erf.go
 #usr/lib/go/src/math/erf_s390x.s
@@ -5638,6 +5851,7 @@
 #usr/lib/go/src/math/sqrt_arm64.s
 #usr/lib/go/src/math/sqrt_mipsx.s
 #usr/lib/go/src/math/sqrt_ppc64x.s
+#usr/lib/go/src/math/sqrt_riscv64.s
 #usr/lib/go/src/math/sqrt_s390x.s
 #usr/lib/go/src/math/sqrt_wasm.s
 #usr/lib/go/src/math/stubs_386.s
@@ -5734,6 +5948,7 @@
 #usr/lib/go/src/net/example_test.go
 #usr/lib/go/src/net/external_test.go
 #usr/lib/go/src/net/fd_plan9.go
+#usr/lib/go/src/net/fd_posix.go
 #usr/lib/go/src/net/fd_unix.go
 #usr/lib/go/src/net/fd_windows.go
 #usr/lib/go/src/net/file.go
@@ -5886,6 +6101,7 @@
 #usr/lib/go/src/net/iprawsock_test.go
 #usr/lib/go/src/net/ipsock.go
 #usr/lib/go/src/net/ipsock_plan9.go
+#usr/lib/go/src/net/ipsock_plan9_test.go
 #usr/lib/go/src/net/ipsock_posix.go
 #usr/lib/go/src/net/ipsock_test.go
 #usr/lib/go/src/net/listen_test.go
@@ -6065,6 +6281,7 @@
 #usr/lib/go/src/os/exec/env_test.go
 #usr/lib/go/src/os/exec/example_test.go
 #usr/lib/go/src/os/exec/exec.go
+#usr/lib/go/src/os/exec/exec_linux_test.go
 #usr/lib/go/src/os/exec/exec_plan9.go
 #usr/lib/go/src/os/exec/exec_posix_test.go
 #usr/lib/go/src/os/exec/exec_test.go
@@ -6078,6 +6295,7 @@
 #usr/lib/go/src/os/exec/lp_unix_test.go
 #usr/lib/go/src/os/exec/lp_windows.go
 #usr/lib/go/src/os/exec/lp_windows_test.go
+#usr/lib/go/src/os/exec/read3.go
 #usr/lib/go/src/os/exec_plan9.go
 #usr/lib/go/src/os/exec_posix.go
 #usr/lib/go/src/os/exec_unix.go
@@ -6091,6 +6309,7 @@
 #usr/lib/go/src/os/executable_solaris.go
 #usr/lib/go/src/os/executable_test.go
 #usr/lib/go/src/os/executable_windows.go
+#usr/lib/go/src/os/export_linux_test.go
 #usr/lib/go/src/os/export_test.go
 #usr/lib/go/src/os/export_unix_test.go
 #usr/lib/go/src/os/export_windows_test.go
@@ -6118,6 +6337,9 @@
 #usr/lib/go/src/os/proc.go
 #usr/lib/go/src/os/rawconn.go
 #usr/lib/go/src/os/rawconn_test.go
+#usr/lib/go/src/os/readfrom_linux.go
+#usr/lib/go/src/os/readfrom_linux_test.go
+#usr/lib/go/src/os/readfrom_stub.go
 #usr/lib/go/src/os/removeall_at.go
 #usr/lib/go/src/os/removeall_noat.go
 #usr/lib/go/src/os/removeall_test.go
@@ -6161,6 +6383,11 @@
 #usr/lib/go/src/os/sys_solaris.go
 #usr/lib/go/src/os/sys_unix.go
 #usr/lib/go/src/os/sys_windows.go
+#usr/lib/go/src/os/testdata
+#usr/lib/go/src/os/testdata/issue37161
+#usr/lib/go/src/os/testdata/issue37161/a
+#usr/lib/go/src/os/testdata/issue37161/b
+#usr/lib/go/src/os/testdata/issue37161/c
 #usr/lib/go/src/os/timeout_test.go
 #usr/lib/go/src/os/types.go
 #usr/lib/go/src/os/types_plan9.go
@@ -6321,9 +6548,7 @@
 #usr/lib/go/src/runtime/cgo/gcc_arm.S
 #usr/lib/go/src/runtime/cgo/gcc_arm64.S
 #usr/lib/go/src/runtime/cgo/gcc_context.c
-#usr/lib/go/src/runtime/cgo/gcc_darwin_386.c
 #usr/lib/go/src/runtime/cgo/gcc_darwin_amd64.c
-#usr/lib/go/src/runtime/cgo/gcc_darwin_arm.c
 #usr/lib/go/src/runtime/cgo/gcc_darwin_arm64.c
 #usr/lib/go/src/runtime/cgo/gcc_dragonfly_amd64.c
 #usr/lib/go/src/runtime/cgo/gcc_fatalf.c
@@ -6357,8 +6582,8 @@
 #usr/lib/go/src/runtime/cgo/gcc_s390x.S
 #usr/lib/go/src/runtime/cgo/gcc_setenv.c
 #usr/lib/go/src/runtime/cgo/gcc_sigaction.c
-#usr/lib/go/src/runtime/cgo/gcc_signal2_darwin_armx.c
-#usr/lib/go/src/runtime/cgo/gcc_signal_darwin_armx.c
+#usr/lib/go/src/runtime/cgo/gcc_signal2_darwin_arm64.c
+#usr/lib/go/src/runtime/cgo/gcc_signal_darwin_arm64.c
 #usr/lib/go/src/runtime/cgo/gcc_signal_darwin_lldb.c
 #usr/lib/go/src/runtime/cgo/gcc_solaris_amd64.c
 #usr/lib/go/src/runtime/cgo/gcc_traceback.c
@@ -6373,9 +6598,8 @@
 #usr/lib/go/src/runtime/cgo/openbsd.go
 #usr/lib/go/src/runtime/cgo/setenv.go
 #usr/lib/go/src/runtime/cgo/sigaction.go
-#usr/lib/go/src/runtime/cgo/signal_darwin_arm.s
+#usr/lib/go/src/runtime/cgo/signal_darwin_arm64.go
 #usr/lib/go/src/runtime/cgo/signal_darwin_arm64.s
-#usr/lib/go/src/runtime/cgo/signal_darwin_armx.go
 #usr/lib/go/src/runtime/cgo_mmap.go
 #usr/lib/go/src/runtime/cgo_ppc64x.go
 #usr/lib/go/src/runtime/cgo_sigaction.go
@@ -6391,6 +6615,7 @@
 #usr/lib/go/src/runtime/compiler.go
 #usr/lib/go/src/runtime/complex.go
 #usr/lib/go/src/runtime/complex_test.go
+#usr/lib/go/src/runtime/conv_wasm_test.go
 #usr/lib/go/src/runtime/cpuflags.go
 #usr/lib/go/src/runtime/cpuflags_amd64.go
 #usr/lib/go/src/runtime/cpuprof.go
@@ -6428,9 +6653,7 @@
 #usr/lib/go/src/runtime/defs_aix_ppc64.go
 #usr/lib/go/src/runtime/defs_arm_linux.go
 #usr/lib/go/src/runtime/defs_darwin.go
-#usr/lib/go/src/runtime/defs_darwin_386.go
 #usr/lib/go/src/runtime/defs_darwin_amd64.go
-#usr/lib/go/src/runtime/defs_darwin_arm.go
 #usr/lib/go/src/runtime/defs_darwin_arm64.go
 #usr/lib/go/src/runtime/defs_dragonfly.go
 #usr/lib/go/src/runtime/defs_dragonfly_amd64.go
@@ -6519,6 +6742,7 @@
 #usr/lib/go/src/runtime/internal/atomic/asm_mipsx.s
 #usr/lib/go/src/runtime/internal/atomic/asm_ppc64x.s
 #usr/lib/go/src/runtime/internal/atomic/asm_s390x.s
+#usr/lib/go/src/runtime/internal/atomic/asm_wasm.s
 #usr/lib/go/src/runtime/internal/atomic/atomic_386.go
 #usr/lib/go/src/runtime/internal/atomic/atomic_amd64.go
 #usr/lib/go/src/runtime/internal/atomic/atomic_arm.go
@@ -6613,6 +6837,9 @@
 #usr/lib/go/src/runtime/lock_futex.go
 #usr/lib/go/src/runtime/lock_js.go
 #usr/lib/go/src/runtime/lock_sema.go
+#usr/lib/go/src/runtime/lockrank.go
+#usr/lib/go/src/runtime/lockrank_off.go
+#usr/lib/go/src/runtime/lockrank_on.go
 #usr/lib/go/src/runtime/malloc.go
 #usr/lib/go/src/runtime/malloc_test.go
 #usr/lib/go/src/runtime/map.go
@@ -6692,6 +6919,7 @@
 #usr/lib/go/src/runtime/msan_amd64.s
 #usr/lib/go/src/runtime/msan_arm64.s
 #usr/lib/go/src/runtime/msize.go
+#usr/lib/go/src/runtime/mspanset.go
 #usr/lib/go/src/runtime/mstats.go
 #usr/lib/go/src/runtime/mwbbuf.go
 #usr/lib/go/src/runtime/nbpipe_fcntl_libc_test.go
@@ -6705,6 +6933,7 @@
 #usr/lib/go/src/runtime/netpoll_epoll.go
 #usr/lib/go/src/runtime/netpoll_fake.go
 #usr/lib/go/src/runtime/netpoll_kqueue.go
+#usr/lib/go/src/runtime/netpoll_os_test.go
 #usr/lib/go/src/runtime/netpoll_solaris.go
 #usr/lib/go/src/runtime/netpoll_stub.go
 #usr/lib/go/src/runtime/netpoll_windows.go
@@ -6721,7 +6950,6 @@
 #usr/lib/go/src/runtime/os_aix.go
 #usr/lib/go/src/runtime/os_android.go
 #usr/lib/go/src/runtime/os_darwin.go
-#usr/lib/go/src/runtime/os_darwin_arm.go
 #usr/lib/go/src/runtime/os_darwin_arm64.go
 #usr/lib/go/src/runtime/os_dragonfly.go
 #usr/lib/go/src/runtime/os_freebsd.go
@@ -6762,24 +6990,17 @@
 #usr/lib/go/src/runtime/os_windows_arm.go
 #usr/lib/go/src/runtime/panic.go
 #usr/lib/go/src/runtime/panic32.go
+#usr/lib/go/src/runtime/panic_test.go
 #usr/lib/go/src/runtime/plugin.go
 #usr/lib/go/src/runtime/pprof
 #usr/lib/go/src/runtime/pprof/elf.go
-#usr/lib/go/src/runtime/pprof/internal
-#usr/lib/go/src/runtime/pprof/internal/profile
-#usr/lib/go/src/runtime/pprof/internal/profile/encode.go
-#usr/lib/go/src/runtime/pprof/internal/profile/filter.go
-#usr/lib/go/src/runtime/pprof/internal/profile/legacy_profile.go
-#usr/lib/go/src/runtime/pprof/internal/profile/profile.go
-#usr/lib/go/src/runtime/pprof/internal/profile/profile_test.go
-#usr/lib/go/src/runtime/pprof/internal/profile/proto.go
-#usr/lib/go/src/runtime/pprof/internal/profile/proto_test.go
-#usr/lib/go/src/runtime/pprof/internal/profile/prune.go
 #usr/lib/go/src/runtime/pprof/label.go
 #usr/lib/go/src/runtime/pprof/label_test.go
 #usr/lib/go/src/runtime/pprof/map.go
 #usr/lib/go/src/runtime/pprof/mprof_test.go
 #usr/lib/go/src/runtime/pprof/pprof.go
+#usr/lib/go/src/runtime/pprof/pprof_norusage.go
+#usr/lib/go/src/runtime/pprof/pprof_rusage.go
 #usr/lib/go/src/runtime/pprof/pprof_test.go
 #usr/lib/go/src/runtime/pprof/proto.go
 #usr/lib/go/src/runtime/pprof/proto_test.go
@@ -6827,6 +7048,7 @@
 #usr/lib/go/src/runtime/race/race_unix_test.go
 #usr/lib/go/src/runtime/race/race_windows_test.go
 #usr/lib/go/src/runtime/race/sched_test.go
+#usr/lib/go/src/runtime/race/syso_test.go
 #usr/lib/go/src/runtime/race/testdata
 #usr/lib/go/src/runtime/race/testdata/atomic_test.go
 #usr/lib/go/src/runtime/race/testdata/cgo_test.go
@@ -6862,9 +7084,7 @@
 #usr/lib/go/src/runtime/rt0_android_amd64.s
 #usr/lib/go/src/runtime/rt0_android_arm.s
 #usr/lib/go/src/runtime/rt0_android_arm64.s
-#usr/lib/go/src/runtime/rt0_darwin_386.s
 #usr/lib/go/src/runtime/rt0_darwin_amd64.s
-#usr/lib/go/src/runtime/rt0_darwin_arm.s
 #usr/lib/go/src/runtime/rt0_darwin_arm64.s
 #usr/lib/go/src/runtime/rt0_dragonfly_amd64.s
 #usr/lib/go/src/runtime/rt0_freebsd_386.s
@@ -6921,9 +7141,7 @@
 #usr/lib/go/src/runtime/signal_arm.go
 #usr/lib/go/src/runtime/signal_arm64.go
 #usr/lib/go/src/runtime/signal_darwin.go
-#usr/lib/go/src/runtime/signal_darwin_386.go
 #usr/lib/go/src/runtime/signal_darwin_amd64.go
-#usr/lib/go/src/runtime/signal_darwin_arm.go
 #usr/lib/go/src/runtime/signal_darwin_arm64.go
 #usr/lib/go/src/runtime/signal_dragonfly.go
 #usr/lib/go/src/runtime/signal_dragonfly_amd64.go
@@ -6997,11 +7215,7 @@
 #usr/lib/go/src/runtime/sys_arm.go
 #usr/lib/go/src/runtime/sys_arm64.go
 #usr/lib/go/src/runtime/sys_darwin.go
-#usr/lib/go/src/runtime/sys_darwin_32.go
-#usr/lib/go/src/runtime/sys_darwin_386.s
-#usr/lib/go/src/runtime/sys_darwin_64.go
 #usr/lib/go/src/runtime/sys_darwin_amd64.s
-#usr/lib/go/src/runtime/sys_darwin_arm.s
 #usr/lib/go/src/runtime/sys_darwin_arm64.s
 #usr/lib/go/src/runtime/sys_dragonfly_amd64.s
 #usr/lib/go/src/runtime/sys_freebsd_386.s
@@ -7062,6 +7276,7 @@
 #usr/lib/go/src/runtime/testdata/testprog/memprof.go
 #usr/lib/go/src/runtime/testdata/testprog/misc.go
 #usr/lib/go/src/runtime/testdata/testprog/numcpu_freebsd.go
+#usr/lib/go/src/runtime/testdata/testprog/panicprint.go
 #usr/lib/go/src/runtime/testdata/testprog/panicrace.go
 #usr/lib/go/src/runtime/testdata/testprog/preempt.go
 #usr/lib/go/src/runtime/testdata/testprog/signal.go
@@ -7086,6 +7301,7 @@
 #usr/lib/go/src/runtime/testdata/testprogcgo/dll_windows.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/dropm.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/dropm_stub.go
+#usr/lib/go/src/runtime/testdata/testprogcgo/eintr.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/exec.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/lockosthread.c
 #usr/lib/go/src/runtime/testdata/testprogcgo/lockosthread.go
@@ -7094,6 +7310,7 @@
 #usr/lib/go/src/runtime/testdata/testprogcgo/pprof.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/raceprof.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/racesig.go
+#usr/lib/go/src/runtime/testdata/testprogcgo/segv.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/sigpanic.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/sigstack.go
 #usr/lib/go/src/runtime/testdata/testprogcgo/stack_windows.go
@@ -7115,6 +7332,9 @@
 #usr/lib/go/src/runtime/testdata/testwinlib
 #usr/lib/go/src/runtime/testdata/testwinlib/main.c
 #usr/lib/go/src/runtime/testdata/testwinlib/main.go
+#usr/lib/go/src/runtime/testdata/testwinlibsignal
+#usr/lib/go/src/runtime/testdata/testwinlibsignal/dummy.go
+#usr/lib/go/src/runtime/testdata/testwinlibsignal/main.c
 #usr/lib/go/src/runtime/textflag.h
 #usr/lib/go/src/runtime/time.go
 #usr/lib/go/src/runtime/time_fake.go
@@ -7188,10 +7408,13 @@
 #usr/lib/go/src/strconv
 #usr/lib/go/src/strconv/atob.go
 #usr/lib/go/src/strconv/atob_test.go
+#usr/lib/go/src/strconv/atoc.go
+#usr/lib/go/src/strconv/atoc_test.go
 #usr/lib/go/src/strconv/atof.go
 #usr/lib/go/src/strconv/atof_test.go
 #usr/lib/go/src/strconv/atoi.go
 #usr/lib/go/src/strconv/atoi_test.go
+#usr/lib/go/src/strconv/ctoa.go
 #usr/lib/go/src/strconv/decimal.go
 #usr/lib/go/src/strconv/decimal_test.go
 #usr/lib/go/src/strconv/doc.go
@@ -7252,6 +7475,8 @@
 #usr/lib/go/src/sync/pool_test.go
 #usr/lib/go/src/sync/poolqueue.go
 #usr/lib/go/src/sync/runtime.go
+#usr/lib/go/src/sync/runtime2.go
+#usr/lib/go/src/sync/runtime2_lockrank.go
 #usr/lib/go/src/sync/runtime_sema_test.go
 #usr/lib/go/src/sync/rwmutex.go
 #usr/lib/go/src/sync/rwmutex_test.go
@@ -7261,9 +7486,7 @@
 #usr/lib/go/src/syscall/asm9_unix1_amd64.s
 #usr/lib/go/src/syscall/asm9_unix2_amd64.s
 #usr/lib/go/src/syscall/asm_aix_ppc64.s
-#usr/lib/go/src/syscall/asm_darwin_386.s
 #usr/lib/go/src/syscall/asm_darwin_amd64.s
-#usr/lib/go/src/syscall/asm_darwin_arm.s
 #usr/lib/go/src/syscall/asm_darwin_arm64.s
 #usr/lib/go/src/syscall/asm_freebsd_arm.s
 #usr/lib/go/src/syscall/asm_freebsd_arm64.s
@@ -7297,7 +7520,6 @@
 #usr/lib/go/src/syscall/dll_windows.go
 #usr/lib/go/src/syscall/endian_big.go
 #usr/lib/go/src/syscall/endian_little.go
-#usr/lib/go/src/syscall/env_plan9.go
 #usr/lib/go/src/syscall/env_unix.go
 #usr/lib/go/src/syscall/env_windows.go
 #usr/lib/go/src/syscall/errors_plan9.go
@@ -7376,12 +7598,12 @@
 #usr/lib/go/src/syscall/syscall_bsd.go
 #usr/lib/go/src/syscall/syscall_bsd_test.go
 #usr/lib/go/src/syscall/syscall_darwin.go
-#usr/lib/go/src/syscall/syscall_darwin_386.go
 #usr/lib/go/src/syscall/syscall_darwin_amd64.go
-#usr/lib/go/src/syscall/syscall_darwin_arm.go
 #usr/lib/go/src/syscall/syscall_darwin_arm64.go
 #usr/lib/go/src/syscall/syscall_dragonfly.go
 #usr/lib/go/src/syscall/syscall_dragonfly_amd64.go
+#usr/lib/go/src/syscall/syscall_dup2_linux.go
+#usr/lib/go/src/syscall/syscall_dup3_linux.go
 #usr/lib/go/src/syscall/syscall_freebsd.go
 #usr/lib/go/src/syscall/syscall_freebsd_386.go
 #usr/lib/go/src/syscall/syscall_freebsd_amd64.go
@@ -7440,9 +7662,7 @@
 #usr/lib/go/src/syscall/types_windows_amd64.go
 #usr/lib/go/src/syscall/types_windows_arm.go
 #usr/lib/go/src/syscall/zerrors_aix_ppc64.go
-#usr/lib/go/src/syscall/zerrors_darwin_386.go
 #usr/lib/go/src/syscall/zerrors_darwin_amd64.go
-#usr/lib/go/src/syscall/zerrors_darwin_arm.go
 #usr/lib/go/src/syscall/zerrors_darwin_arm64.go
 #usr/lib/go/src/syscall/zerrors_dragonfly_amd64.go
 #usr/lib/go/src/syscall/zerrors_freebsd_386.go
@@ -7474,12 +7694,8 @@
 #usr/lib/go/src/syscall/zerrors_windows_386.go
 #usr/lib/go/src/syscall/zerrors_windows_amd64.go
 #usr/lib/go/src/syscall/zsyscall_aix_ppc64.go
-#usr/lib/go/src/syscall/zsyscall_darwin_386.go
-#usr/lib/go/src/syscall/zsyscall_darwin_386.s
 #usr/lib/go/src/syscall/zsyscall_darwin_amd64.go
 #usr/lib/go/src/syscall/zsyscall_darwin_amd64.s
-#usr/lib/go/src/syscall/zsyscall_darwin_arm.go
-#usr/lib/go/src/syscall/zsyscall_darwin_arm.s
 #usr/lib/go/src/syscall/zsyscall_darwin_arm64.go
 #usr/lib/go/src/syscall/zsyscall_darwin_arm64.s
 #usr/lib/go/src/syscall/zsyscall_dragonfly_amd64.go
@@ -7513,9 +7729,7 @@
 #usr/lib/go/src/syscall/zsyscall_solaris_amd64.go
 #usr/lib/go/src/syscall/zsyscall_windows.go
 #usr/lib/go/src/syscall/zsysctl_openbsd.go
-#usr/lib/go/src/syscall/zsysnum_darwin_386.go
 #usr/lib/go/src/syscall/zsysnum_darwin_amd64.go
-#usr/lib/go/src/syscall/zsysnum_darwin_arm.go
 #usr/lib/go/src/syscall/zsysnum_darwin_arm64.go
 #usr/lib/go/src/syscall/zsysnum_dragonfly_amd64.go
 #usr/lib/go/src/syscall/zsysnum_freebsd_386.go
@@ -7547,9 +7761,7 @@
 #usr/lib/go/src/syscall/zsysnum_windows_386.go
 #usr/lib/go/src/syscall/zsysnum_windows_amd64.go
 #usr/lib/go/src/syscall/ztypes_aix_ppc64.go
-#usr/lib/go/src/syscall/ztypes_darwin_386.go
 #usr/lib/go/src/syscall/ztypes_darwin_amd64.go
-#usr/lib/go/src/syscall/ztypes_darwin_arm.go
 #usr/lib/go/src/syscall/ztypes_darwin_arm64.go
 #usr/lib/go/src/syscall/ztypes_dragonfly_amd64.go
 #usr/lib/go/src/syscall/ztypes_freebsd_386.go
@@ -7628,6 +7840,7 @@
 #usr/lib/go/src/text/template/exec_test.go
 #usr/lib/go/src/text/template/funcs.go
 #usr/lib/go/src/text/template/helper.go
+#usr/lib/go/src/text/template/link_test.go
 #usr/lib/go/src/text/template/multi_test.go
 #usr/lib/go/src/text/template/option.go
 #usr/lib/go/src/text/template/parse
@@ -7643,6 +7856,7 @@
 #usr/lib/go/src/text/template/testdata/tmpl1.tmpl
 #usr/lib/go/src/text/template/testdata/tmpl2.tmpl
 #usr/lib/go/src/time
+#usr/lib/go/src/time/embed.go
 #usr/lib/go/src/time/example_test.go
 #usr/lib/go/src/time/export_android_test.go
 #usr/lib/go/src/time/export_test.go
@@ -7661,6 +7875,11 @@
 #usr/lib/go/src/time/tick_test.go
 #usr/lib/go/src/time/time.go
 #usr/lib/go/src/time/time_test.go
+#usr/lib/go/src/time/tzdata
+#usr/lib/go/src/time/tzdata/generate_zipdata.go
+#usr/lib/go/src/time/tzdata/tzdata.go
+#usr/lib/go/src/time/tzdata/zipdata.go
+#usr/lib/go/src/time/tzdata_test.go
 #usr/lib/go/src/time/zoneinfo.go
 #usr/lib/go/src/time/zoneinfo_abbrs_windows.go
 #usr/lib/go/src/time/zoneinfo_android.go
@@ -7745,12 +7964,10 @@
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_amd64.go
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_amd64.s
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_generic.go
-#usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_noasm.go
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_ppc64le.go
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_ppc64le.s
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_s390x.go
 #usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_s390x.s
-#usr/lib/go/src/vendor/golang.org/x/crypto/poly1305/sum_vmsl_s390x.s
 #usr/lib/go/src/vendor/golang.org/x/net
 #usr/lib/go/src/vendor/golang.org/x/net/AUTHORS
 #usr/lib/go/src/vendor/golang.org/x/net/CONTRIBUTORS
@@ -7838,13 +8055,20 @@
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_aix_ppc64.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_arm.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_arm64.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_arm64.s
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
-#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gccgo.c
-#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gccgo.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux_arm.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_linux_s390x.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_mips64x.go
@@ -7855,6 +8079,7 @@
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_wasm.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_x86.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/cpu_x86.s
+#usr/lib/go/src/vendor/golang.org/x/sys/cpu/hwcap_linux.go
 #usr/lib/go/src/vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
 #usr/lib/go/src/vendor/golang.org/x/text
 #usr/lib/go/src/vendor/golang.org/x/text/AUTHORS
@@ -7989,19 +8214,23 @@
 #usr/lib/go/test/cmplxdivide1.go
 #usr/lib/go/test/codegen
 #usr/lib/go/test/codegen/README
+#usr/lib/go/test/codegen/addrcalc.go
 #usr/lib/go/test/codegen/alloc.go
 #usr/lib/go/test/codegen/arithmetic.go
 #usr/lib/go/test/codegen/bitfield.go
 #usr/lib/go/test/codegen/bits.go
+#usr/lib/go/test/codegen/bool.go
 #usr/lib/go/test/codegen/compare_and_branch.go
 #usr/lib/go/test/codegen/comparisons.go
 #usr/lib/go/test/codegen/condmove.go
 #usr/lib/go/test/codegen/copy.go
 #usr/lib/go/test/codegen/floats.go
+#usr/lib/go/test/codegen/fuse.go
 #usr/lib/go/test/codegen/issue22703.go
 #usr/lib/go/test/codegen/issue25378.go
 #usr/lib/go/test/codegen/issue31618.go
 #usr/lib/go/test/codegen/issue33580.go
+#usr/lib/go/test/codegen/issue38554.go
 #usr/lib/go/test/codegen/mapaccess.go
 #usr/lib/go/test/codegen/maps.go
 #usr/lib/go/test/codegen/math.go
@@ -8010,9 +8239,13 @@
 #usr/lib/go/test/codegen/memops.go
 #usr/lib/go/test/codegen/noextend.go
 #usr/lib/go/test/codegen/race.go
+#usr/lib/go/test/codegen/retpoline.go
 #usr/lib/go/test/codegen/rotate.go
 #usr/lib/go/test/codegen/shift.go
+#usr/lib/go/test/codegen/shortcircuit.go
 #usr/lib/go/test/codegen/slices.go
+#usr/lib/go/test/codegen/smallintiface.go
+#usr/lib/go/test/codegen/spectre.go
 #usr/lib/go/test/codegen/stack.go
 #usr/lib/go/test/codegen/strings.go
 #usr/lib/go/test/codegen/structs.go
@@ -8053,6 +8286,7 @@
 #usr/lib/go/test/deferprint.go
 #usr/lib/go/test/deferprint.out
 #usr/lib/go/test/devirt.go
+#usr/lib/go/test/directive.go
 #usr/lib/go/test/divide.go
 #usr/lib/go/test/divmod.go
 #usr/lib/go/test/dwarf
@@ -8726,6 +8960,12 @@
 #usr/lib/go/test/fixedbugs/bug506.dir/a.go
 #usr/lib/go/test/fixedbugs/bug506.dir/main.go
 #usr/lib/go/test/fixedbugs/bug506.go
+#usr/lib/go/test/fixedbugs/bug507.dir
+#usr/lib/go/test/fixedbugs/bug507.dir/a.go
+#usr/lib/go/test/fixedbugs/bug507.dir/b.go
+#usr/lib/go/test/fixedbugs/bug507.dir/c.go
+#usr/lib/go/test/fixedbugs/bug507.go
+#usr/lib/go/test/fixedbugs/bug508.go
 #usr/lib/go/test/fixedbugs/gcc61204.go
 #usr/lib/go/test/fixedbugs/gcc61244.go
 #usr/lib/go/test/fixedbugs/gcc61246.go
@@ -9443,6 +9683,10 @@
 #usr/lib/go/test/fixedbugs/issue30956.out
 #usr/lib/go/test/fixedbugs/issue30977.go
 #usr/lib/go/test/fixedbugs/issue31010.go
+#usr/lib/go/test/fixedbugs/issue31053.dir
+#usr/lib/go/test/fixedbugs/issue31053.dir/f1.go
+#usr/lib/go/test/fixedbugs/issue31053.dir/main.go
+#usr/lib/go/test/fixedbugs/issue31053.go
 #usr/lib/go/test/fixedbugs/issue31060.go
 #usr/lib/go/test/fixedbugs/issue31252.dir
 #usr/lib/go/test/fixedbugs/issue31252.dir/a.go
@@ -9536,6 +9780,7 @@
 #usr/lib/go/test/fixedbugs/issue33219.go
 #usr/lib/go/test/fixedbugs/issue33275.go
 #usr/lib/go/test/fixedbugs/issue33275_run.go
+#usr/lib/go/test/fixedbugs/issue33308.go
 #usr/lib/go/test/fixedbugs/issue33355.go
 #usr/lib/go/test/fixedbugs/issue33386.go
 #usr/lib/go/test/fixedbugs/issue33438.go
@@ -9567,6 +9812,7 @@
 #usr/lib/go/test/fixedbugs/issue34966.go
 #usr/lib/go/test/fixedbugs/issue34968.go
 #usr/lib/go/test/fixedbugs/issue35027.go
+#usr/lib/go/test/fixedbugs/issue35073.go
 #usr/lib/go/test/fixedbugs/issue35157.go
 #usr/lib/go/test/fixedbugs/issue35291.go
 #usr/lib/go/test/fixedbugs/issue35518.go
@@ -9574,6 +9820,8 @@
 #usr/lib/go/test/fixedbugs/issue3552.dir/one.go
 #usr/lib/go/test/fixedbugs/issue3552.dir/two.go
 #usr/lib/go/test/fixedbugs/issue3552.go
+#usr/lib/go/test/fixedbugs/issue35576.go
+#usr/lib/go/test/fixedbugs/issue35576.out
 #usr/lib/go/test/fixedbugs/issue35586.dir
 #usr/lib/go/test/fixedbugs/issue35586.dir/a.go
 #usr/lib/go/test/fixedbugs/issue35586.dir/b.go
@@ -9583,19 +9831,49 @@
 #usr/lib/go/test/fixedbugs/issue36085.dir/a.go
 #usr/lib/go/test/fixedbugs/issue36085.dir/b.go
 #usr/lib/go/test/fixedbugs/issue36085.go
+#usr/lib/go/test/fixedbugs/issue36259.go
+#usr/lib/go/test/fixedbugs/issue36437.go
 #usr/lib/go/test/fixedbugs/issue36516.go
+#usr/lib/go/test/fixedbugs/issue36705.go
 #usr/lib/go/test/fixedbugs/issue36723.go
 #usr/lib/go/test/fixedbugs/issue3705.go
+#usr/lib/go/test/fixedbugs/issue37246.go
+#usr/lib/go/test/fixedbugs/issue37513.dir
+#usr/lib/go/test/fixedbugs/issue37513.dir/main.go
+#usr/lib/go/test/fixedbugs/issue37513.dir/sigill_amd64.s
+#usr/lib/go/test/fixedbugs/issue37513.go
 #usr/lib/go/test/fixedbugs/issue37716.go
+#usr/lib/go/test/fixedbugs/issue37753.go
 #usr/lib/go/test/fixedbugs/issue3783.go
+#usr/lib/go/test/fixedbugs/issue37975.go
+#usr/lib/go/test/fixedbugs/issue38093.go
+#usr/lib/go/test/fixedbugs/issue38117.go
+#usr/lib/go/test/fixedbugs/issue38356.go
+#usr/lib/go/test/fixedbugs/issue38359.go
+#usr/lib/go/test/fixedbugs/issue38496.go
+#usr/lib/go/test/fixedbugs/issue38690.go
+#usr/lib/go/test/fixedbugs/issue38746.go
+#usr/lib/go/test/fixedbugs/issue38916.go
 #usr/lib/go/test/fixedbugs/issue3925.go
+#usr/lib/go/test/fixedbugs/issue39459.go
+#usr/lib/go/test/fixedbugs/issue39472.go
+#usr/lib/go/test/fixedbugs/issue39541.go
+#usr/lib/go/test/fixedbugs/issue39651.go
+#usr/lib/go/test/fixedbugs/issue40367.go
+#usr/lib/go/test/fixedbugs/issue40629.go
 #usr/lib/go/test/fixedbugs/issue4066.go
+#usr/lib/go/test/fixedbugs/issue40746.go
 #usr/lib/go/test/fixedbugs/issue4085a.go
 #usr/lib/go/test/fixedbugs/issue4085b.go
+#usr/lib/go/test/fixedbugs/issue40917.go
+#usr/lib/go/test/fixedbugs/issue40954.go
 #usr/lib/go/test/fixedbugs/issue4097.go
 #usr/lib/go/test/fixedbugs/issue4099.go
 #usr/lib/go/test/fixedbugs/issue4162.go
 #usr/lib/go/test/fixedbugs/issue4167.go
+#usr/lib/go/test/fixedbugs/issue41711.go
+#usr/lib/go/test/fixedbugs/issue42032.go
+#usr/lib/go/test/fixedbugs/issue42076.go
 #usr/lib/go/test/fixedbugs/issue4215.go
 #usr/lib/go/test/fixedbugs/issue4232.go
 #usr/lib/go/test/fixedbugs/issue4251.go
@@ -9905,6 +10183,7 @@
 #usr/lib/go/test/fixedbugs/issue8475.go
 #usr/lib/go/test/fixedbugs/issue8501.go
 #usr/lib/go/test/fixedbugs/issue8507.go
+#usr/lib/go/test/fixedbugs/issue8606.go
 #usr/lib/go/test/fixedbugs/issue8612.go
 #usr/lib/go/test/fixedbugs/issue8613.go
 #usr/lib/go/test/fixedbugs/issue8620.go
@@ -10110,6 +10389,7 @@
 #usr/lib/go/test/makechan.go
 #usr/lib/go/test/makemap.go
 #usr/lib/go/test/makenew.go
+#usr/lib/go/test/makeslice.go
 #usr/lib/go/test/mallocfin.go
 #usr/lib/go/test/map.go
 #usr/lib/go/test/map1.go
@@ -10169,6 +10449,8 @@
 #usr/lib/go/test/reflectmethod2.go
 #usr/lib/go/test/reflectmethod3.go
 #usr/lib/go/test/reflectmethod4.go
+#usr/lib/go/test/reflectmethod5.go
+#usr/lib/go/test/reflectmethod6.go
 #usr/lib/go/test/rename.go
 #usr/lib/go/test/rename1.go
 #usr/lib/go/test/reorder.go
@@ -10264,5 +10546,6 @@
 #usr/lib/go/test/utf.go
 #usr/lib/go/test/varerr.go
 #usr/lib/go/test/varinit.go
+#usr/lib/go/test/winbatch.go
 #usr/lib/go/test/writebarrier.go
 #usr/lib/go/test/zerodivide.go
diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode
index 9b3c50897..ee43ff015 100644
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03
 lib/firmware/intel-ucode/06-55-04
 lib/firmware/intel-ucode/06-55-06
 lib/firmware/intel-ucode/06-55-07
+lib/firmware/intel-ucode/06-55-0b
 lib/firmware/intel-ucode/06-56-02
 lib/firmware/intel-ucode/06-56-03
 lib/firmware/intel-ucode/06-56-04
@@ -82,6 +83,7 @@ lib/firmware/intel-ucode/06-66-03
 lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
+lib/firmware/intel-ucode/06-8a-01
 lib/firmware/intel-ucode/06-8e-09
 lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b
@@ -91,7 +93,11 @@ lib/firmware/intel-ucode/06-9e-0a
 lib/firmware/intel-ucode/06-9e-0b
 lib/firmware/intel-ucode/06-9e-0c
 lib/firmware/intel-ucode/06-9e-0d
+lib/firmware/intel-ucode/06-a5-02
+lib/firmware/intel-ucode/06-a5-03
+lib/firmware/intel-ucode/06-a5-05
 lib/firmware/intel-ucode/06-a6-00
+lib/firmware/intel-ucode/06-a6-01
 lib/firmware/intel-ucode/0f-00-07
 lib/firmware/intel-ucode/0f-00-0a
 lib/firmware/intel-ucode/0f-01-02
diff --git a/config/rootfiles/core/152/exclude b/config/rootfiles/core/153/exclude
similarity index 100%
rename from config/rootfiles/core/152/exclude
rename to config/rootfiles/core/153/exclude
diff --git a/config/rootfiles/core/153/filelists/aarch64/linux b/config/rootfiles/core/153/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/aarch64/linux-initrd b/config/rootfiles/core/153/filelists/aarch64/linux-initrd
new file mode 120000
index 000000000..8acdb0f31
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/armv5tel/linux-multi b/config/rootfiles/core/153/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/bash b/config/rootfiles/core/153/filelists/bash
new file mode 120000
index 000000000..de970cb1d
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/bash
@@ -0,0 +1 @@
+../../../common/bash
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/curl b/config/rootfiles/core/153/filelists/curl
new file mode 120000
index 000000000..4b84bef53
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/ddns b/config/rootfiles/core/153/filelists/ddns
new file mode 120000
index 000000000..739516420
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/file b/config/rootfiles/core/153/filelists/file
new file mode 120000
index 000000000..0c60e43aa
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/file
@@ -0,0 +1 @@
+../../../common/file
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files
new file mode 100644
index 000000000..0649f85cb
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/files
@@ -0,0 +1,27 @@
+etc/issue
+etc/ntp.conf
+etc/os-release
+etc/rc.d/init.d/network
+etc/rc.d/init.d/unbound
+etc/system-release
+etc/sysctl.conf
+lib/udev/network-hotplug-bridges
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ipinfo.cgi
+srv/web/ipfire/cgi-bin/location-block.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/remote.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/zoneconf.cgi
+srv/web/ipfire/html/include/zoneconf.js
+usr/lib/firewall/rules.pl
+var/ipfire/location-functions.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/153/filelists/hwdata b/config/rootfiles/core/153/filelists/hwdata
new file mode 120000
index 000000000..ced911666
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/hwdata
@@ -0,0 +1 @@
+../../../common/hwdata
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/i586/intel-microcode b/config/rootfiles/core/153/filelists/i586/intel-microcode
new file mode 120000
index 000000000..f03e84778
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/i586/intel-microcode
@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/i586/linux b/config/rootfiles/core/153/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/i586/linux-initrd b/config/rootfiles/core/153/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/ids-ruleset-sources b/config/rootfiles/core/153/filelists/ids-ruleset-sources
new file mode 120000
index 000000000..a226ada39
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/ids-ruleset-sources
@@ -0,0 +1 @@
+../../../common/ids-ruleset-sources
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/knot b/config/rootfiles/core/153/filelists/knot
similarity index 100%
rename from config/rootfiles/core/152/filelists/knot
rename to config/rootfiles/core/153/filelists/knot
diff --git a/config/rootfiles/core/153/filelists/libarchive b/config/rootfiles/core/153/filelists/libarchive
new file mode 120000
index 000000000..551f1f743
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/libhtp b/config/rootfiles/core/153/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/152/filelists/libhtp
rename to config/rootfiles/core/153/filelists/libhtp
diff --git a/config/rootfiles/core/152/filelists/libloc b/config/rootfiles/core/153/filelists/libloc
similarity index 100%
rename from config/rootfiles/core/152/filelists/libloc
rename to config/rootfiles/core/153/filelists/libloc
diff --git a/config/rootfiles/core/153/filelists/logwatch b/config/rootfiles/core/153/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/openvpn b/config/rootfiles/core/153/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/strongswan b/config/rootfiles/core/153/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/suricata b/config/rootfiles/core/153/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/152/filelists/suricata
rename to config/rootfiles/core/153/filelists/suricata
diff --git a/config/rootfiles/core/153/filelists/tzdata b/config/rootfiles/core/153/filelists/tzdata
new file mode 120000
index 000000000..5a6e3252f
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch b/config/rootfiles/core/153/filelists/usb_modeswitch
new file mode 120000
index 000000000..acbab6f33
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch_data b/config/rootfiles/core/153/filelists/usb_modeswitch_data
new file mode 120000
index 000000000..4cbce46cf
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/x86_64/intel-microcode b/config/rootfiles/core/153/filelists/x86_64/intel-microcode
new file mode 120000
index 000000000..d5ac074e2
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/x86_64/linux b/config/rootfiles/core/153/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/x86_64/linux-initrd b/config/rootfiles/core/153/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/update.sh
new file mode 100644
index 000000000..08adaf797
--- /dev/null
+++ b/config/rootfiles/core/153/update.sh
@@ -0,0 +1,159 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2020 IPFire-Team info@ipfire.org.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=153
+
+exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# force fsck at next boot, this may fix free space on xfs
+	touch /forcefsck
+	# don't start pakfire again at error
+	killall -KILL pak_update
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+	cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+	*-ipfire-kirkwood)
+		exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1
+		;;
+	*-ipfire*)
+		# Ok.
+		;;
+	*)
+		exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+		;;
+esac
+if [ -e /boot/grub/grub.conf ]; then
+	exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1
+fi
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+	exit_with_error "ERROR cannot update because not enough free space on root." 2
+	exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+# Remove files
+
+# Stop services
+/etc/init.d/ipsec stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update permissions
+chown -vR root:root /etc/ntp
+
+# Update owernship of "/var/ipfire/red"
+chown nobody:nobody /var/ipfire/red
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Fix invalid cronjob syntax
+sed -e "s/^%hourly,random * * */%hourly,random */g" \
+	-i /var/spool/cron/root.orig
+fcrontab -z
+
+# Start services
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+    /etc/init.d/ipsec start
+fi
+/etc/init.d/suricata restart
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+
+# Reload sysctl.conf
+sysctl -p
+
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f  /etc/sysconfig/lm_sensors
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+	sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+	/boot/pakfire-kernel-update ${KVER}
+fi
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/152/exclude b/config/rootfiles/oldcore/152/exclude
new file mode 100644
index 000000000..e7500a03d
--- /dev/null
+++ b/config/rootfiles/oldcore/152/exclude
@@ -0,0 +1,32 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/152/filelists/aarch64/python b/config/rootfiles/oldcore/152/filelists/aarch64/python
similarity index 100%
rename from config/rootfiles/core/152/filelists/aarch64/python
rename to config/rootfiles/oldcore/152/filelists/aarch64/python
diff --git a/config/rootfiles/core/152/filelists/aarch64/python3 b/config/rootfiles/oldcore/152/filelists/aarch64/python3
similarity index 100%
rename from config/rootfiles/core/152/filelists/aarch64/python3
rename to config/rootfiles/oldcore/152/filelists/aarch64/python3
diff --git a/config/rootfiles/core/152/filelists/armv5tel/python b/config/rootfiles/oldcore/152/filelists/armv5tel/python
similarity index 100%
rename from config/rootfiles/core/152/filelists/armv5tel/python
rename to config/rootfiles/oldcore/152/filelists/armv5tel/python
diff --git a/config/rootfiles/core/152/filelists/armv5tel/python3 b/config/rootfiles/oldcore/152/filelists/armv5tel/python3
similarity index 100%
rename from config/rootfiles/core/152/filelists/armv5tel/python3
rename to config/rootfiles/oldcore/152/filelists/armv5tel/python3
diff --git a/config/rootfiles/core/152/filelists/ca-certificates b/config/rootfiles/oldcore/152/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/152/filelists/ca-certificates
rename to config/rootfiles/oldcore/152/filelists/ca-certificates
diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/oldcore/152/filelists/files
similarity index 100%
rename from config/rootfiles/core/152/filelists/files
rename to config/rootfiles/oldcore/152/filelists/files
diff --git a/config/rootfiles/core/152/filelists/i586/python b/config/rootfiles/oldcore/152/filelists/i586/python
similarity index 100%
rename from config/rootfiles/core/152/filelists/i586/python
rename to config/rootfiles/oldcore/152/filelists/i586/python
diff --git a/config/rootfiles/core/152/filelists/i586/python3 b/config/rootfiles/oldcore/152/filelists/i586/python3
similarity index 100%
rename from config/rootfiles/core/152/filelists/i586/python3
rename to config/rootfiles/oldcore/152/filelists/i586/python3
diff --git a/config/rootfiles/oldcore/152/filelists/knot b/config/rootfiles/oldcore/152/filelists/knot
new file mode 120000
index 000000000..28e96f878
--- /dev/null
+++ b/config/rootfiles/oldcore/152/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/152/filelists/libhtp b/config/rootfiles/oldcore/152/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/oldcore/152/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/setup b/config/rootfiles/oldcore/152/filelists/setup
similarity index 100%
rename from config/rootfiles/core/152/filelists/setup
rename to config/rootfiles/oldcore/152/filelists/setup
diff --git a/config/rootfiles/oldcore/152/filelists/suricata b/config/rootfiles/oldcore/152/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/oldcore/152/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/unbound b/config/rootfiles/oldcore/152/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/152/filelists/unbound
rename to config/rootfiles/oldcore/152/filelists/unbound
diff --git a/config/rootfiles/core/152/filelists/x86_64/python b/config/rootfiles/oldcore/152/filelists/x86_64/python
similarity index 100%
rename from config/rootfiles/core/152/filelists/x86_64/python
rename to config/rootfiles/oldcore/152/filelists/x86_64/python
diff --git a/config/rootfiles/core/152/filelists/x86_64/python3 b/config/rootfiles/oldcore/152/filelists/x86_64/python3
similarity index 100%
rename from config/rootfiles/core/152/filelists/x86_64/python3
rename to config/rootfiles/oldcore/152/filelists/x86_64/python3
diff --git a/config/rootfiles/core/152/filelists/yaml b/config/rootfiles/oldcore/152/filelists/yaml
similarity index 100%
rename from config/rootfiles/core/152/filelists/yaml
rename to config/rootfiles/oldcore/152/filelists/yaml
diff --git a/config/rootfiles/core/152/update.sh b/config/rootfiles/oldcore/152/update.sh
similarity index 100%
rename from config/rootfiles/core/152/update.sh
rename to config/rootfiles/oldcore/152/update.sh
diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi
index 2dd21fe99..40e2e15ff 100644
--- a/config/rootfiles/packages/aarch64/vdr_dvbapi
+++ b/config/rootfiles/packages/aarch64/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
diff --git a/config/rootfiles/packages/amavisd b/config/rootfiles/packages/amavisd
deleted file mode 100644
index f2e1c3f3b..000000000
--- a/config/rootfiles/packages/amavisd
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/amavisd.conf
-etc/rc.d/init.d/amavisd
-usr/bin/amavisd
-var/amavis
-var/amavis/db
-var/amavis/tmp
-var/virusmails
diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd
index b58ed2b47..a28c961eb 100644
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -33,3 +33,4 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 var/ipfire/menu.d/EX-apcupsd.menu
+var/ipfire/backup/addons/includes/apcupsd
diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
index 2dd21fe99..40e2e15ff 100644
--- a/config/rootfiles/packages/armv5tel/vdr_dvbapi
+++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
diff --git a/config/rootfiles/packages/aws-cli b/config/rootfiles/packages/aws-cli
index 663c58ecc..dafd3ba68 100644
--- a/config/rootfiles/packages/aws-cli
+++ b/config/rootfiles/packages/aws-cli
@@ -4,18 +4,25 @@ usr/bin/aws_bash_completer
 usr/bin/aws_completer
 #usr/bin/aws_zsh_completer.sh
 #usr/lib/python3.8/site-packages/awscli
-#usr/lib/python3.8/site-packages/awscli-1.15.77-py3.8.egg-info
-#usr/lib/python3.8/site-packages/awscli-1.15.77-py3.8.egg-info/PKG-INFO
-#usr/lib/python3.8/site-packages/awscli-1.15.77-py3.8.egg-info/SOURCES.txt
-#usr/lib/python3.8/site-packages/awscli-1.15.77-py3.8.egg-info/dependency_links.txt
-#usr/lib/python3.8/site-packages/awscli-1.15.77-py3.8.egg-info/requires.txt
-#usr/lib/python3.8/site-packages/awscli-1.15.77-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/awscli-1.18.188-py3.8.egg-info
+#usr/lib/python3.8/site-packages/awscli-1.18.188-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/awscli-1.18.188-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/awscli-1.18.188-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/awscli-1.18.188-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/awscli-1.18.188-py3.8.egg-info/top_level.txt
 usr/lib/python3.8/site-packages/awscli/__init__.py
 usr/lib/python3.8/site-packages/awscli/__main__.py
 usr/lib/python3.8/site-packages/awscli/alias.py
 usr/lib/python3.8/site-packages/awscli/argparser.py
 usr/lib/python3.8/site-packages/awscli/argprocess.py
 usr/lib/python3.8/site-packages/awscli/arguments.py
+usr/lib/python3.8/site-packages/awscli/bcdoc
+usr/lib/python3.8/site-packages/awscli/bcdoc/__init__.py
+usr/lib/python3.8/site-packages/awscli/bcdoc/docevents.py
+usr/lib/python3.8/site-packages/awscli/bcdoc/docstringparser.py
+usr/lib/python3.8/site-packages/awscli/bcdoc/restdoc.py
+usr/lib/python3.8/site-packages/awscli/bcdoc/style.py
+usr/lib/python3.8/site-packages/awscli/bcdoc/textwriter.py
 usr/lib/python3.8/site-packages/awscli/clidocs.py
 usr/lib/python3.8/site-packages/awscli/clidriver.py
 usr/lib/python3.8/site-packages/awscli/commands.py
@@ -45,6 +52,9 @@ usr/lib/python3.8/site-packages/awscli/customizations/cloudtrail/__init__.py
 usr/lib/python3.8/site-packages/awscli/customizations/cloudtrail/subscribe.py
 usr/lib/python3.8/site-packages/awscli/customizations/cloudtrail/utils.py
 usr/lib/python3.8/site-packages/awscli/customizations/cloudtrail/validation.py
+#usr/lib/python3.8/site-packages/awscli/customizations/codeartifact
+usr/lib/python3.8/site-packages/awscli/customizations/codeartifact/__init__.py
+usr/lib/python3.8/site-packages/awscli/customizations/codeartifact/login.py
 usr/lib/python3.8/site-packages/awscli/customizations/codecommit.py
 #usr/lib/python3.8/site-packages/awscli/customizations/codedeploy
 usr/lib/python3.8/site-packages/awscli/customizations/codedeploy/__init__.py
@@ -84,6 +94,7 @@ usr/lib/python3.8/site-packages/awscli/customizations/dlm/constants.py
 usr/lib/python3.8/site-packages/awscli/customizations/dlm/createdefaultrole.py
 usr/lib/python3.8/site-packages/awscli/customizations/dlm/dlm.py
 usr/lib/python3.8/site-packages/awscli/customizations/dlm/iam.py
+usr/lib/python3.8/site-packages/awscli/customizations/dynamodb.py
 #usr/lib/python3.8/site-packages/awscli/customizations/ec2
 usr/lib/python3.8/site-packages/awscli/customizations/ec2/__init__.py
 usr/lib/python3.8/site-packages/awscli/customizations/ec2/addcount.py
@@ -94,6 +105,19 @@ usr/lib/python3.8/site-packages/awscli/customizations/ec2/protocolarg.py
 usr/lib/python3.8/site-packages/awscli/customizations/ec2/runinstances.py
 usr/lib/python3.8/site-packages/awscli/customizations/ec2/secgroupsimplify.py
 usr/lib/python3.8/site-packages/awscli/customizations/ecr.py
+usr/lib/python3.8/site-packages/awscli/customizations/ecr_public.py
+#usr/lib/python3.8/site-packages/awscli/customizations/ecs
+usr/lib/python3.8/site-packages/awscli/customizations/ecs/__init__.py
+usr/lib/python3.8/site-packages/awscli/customizations/ecs/deploy.py
+usr/lib/python3.8/site-packages/awscli/customizations/ecs/exceptions.py
+usr/lib/python3.8/site-packages/awscli/customizations/ecs/filehelpers.py
+#usr/lib/python3.8/site-packages/awscli/customizations/eks
+usr/lib/python3.8/site-packages/awscli/customizations/eks/__init__.py
+usr/lib/python3.8/site-packages/awscli/customizations/eks/exceptions.py
+usr/lib/python3.8/site-packages/awscli/customizations/eks/get_token.py
+usr/lib/python3.8/site-packages/awscli/customizations/eks/kubeconfig.py
+usr/lib/python3.8/site-packages/awscli/customizations/eks/ordered_yaml.py
+usr/lib/python3.8/site-packages/awscli/customizations/eks/update_kubeconfig.py
 #usr/lib/python3.8/site-packages/awscli/customizations/emr
 usr/lib/python3.8/site-packages/awscli/customizations/emr/__init__.py
 usr/lib/python3.8/site-packages/awscli/customizations/emr/addinstancegroups.py
@@ -136,6 +160,7 @@ usr/lib/python3.8/site-packages/awscli/customizations/history/__init__.py
 usr/lib/python3.8/site-packages/awscli/customizations/history/commands.py
 usr/lib/python3.8/site-packages/awscli/customizations/history/constants.py
 usr/lib/python3.8/site-packages/awscli/customizations/history/db.py
+usr/lib/python3.8/site-packages/awscli/customizations/history/filters.py
 usr/lib/python3.8/site-packages/awscli/customizations/history/list.py
 usr/lib/python3.8/site-packages/awscli/customizations/history/show.py
 usr/lib/python3.8/site-packages/awscli/customizations/iamvirtmfa.py
@@ -173,7 +198,6 @@ usr/lib/python3.8/site-packages/awscli/customizations/s3/syncstrategy/register.p
 usr/lib/python3.8/site-packages/awscli/customizations/s3/syncstrategy/sizeonly.py
 usr/lib/python3.8/site-packages/awscli/customizations/s3/transferconfig.py
 usr/lib/python3.8/site-packages/awscli/customizations/s3/utils.py
-usr/lib/python3.8/site-packages/awscli/customizations/s3endpoint.py
 usr/lib/python3.8/site-packages/awscli/customizations/s3errormsg.py
 usr/lib/python3.8/site-packages/awscli/customizations/s3events.py
 usr/lib/python3.8/site-packages/awscli/customizations/s3uploader.py
@@ -189,8 +213,11 @@ usr/lib/python3.8/site-packages/awscli/customizations/servicecatalog/generatepro
 usr/lib/python3.8/site-packages/awscli/customizations/servicecatalog/helptext.py
 usr/lib/python3.8/site-packages/awscli/customizations/servicecatalog/utils.py
 usr/lib/python3.8/site-packages/awscli/customizations/sessendemail.py
+usr/lib/python3.8/site-packages/awscli/customizations/sessionmanager.py
+usr/lib/python3.8/site-packages/awscli/customizations/sms_voice.py
 usr/lib/python3.8/site-packages/awscli/customizations/streamingoutputarg.py
 usr/lib/python3.8/site-packages/awscli/customizations/toplevelbool.py
+usr/lib/python3.8/site-packages/awscli/customizations/translate.py
 usr/lib/python3.8/site-packages/awscli/customizations/utils.py
 usr/lib/python3.8/site-packages/awscli/customizations/waiters.py
 #usr/lib/python3.8/site-packages/awscli/data
@@ -225,6 +252,12 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/acm/request-certificate.rst
 #usr/lib/python3.8/site-packages/awscli/examples/acm/resend-validation-email.rst
 #usr/lib/python3.8/site-packages/awscli/examples/acm/update-certificate-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/alexaforbusiness
+#usr/lib/python3.8/site-packages/awscli/examples/alexaforbusiness/create-network-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/alexaforbusiness/delete-network-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/alexaforbusiness/get-network-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/alexaforbusiness/search-network-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/alexaforbusiness/update-network-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/apigateway
 #usr/lib/python3.8/site-packages/awscli/examples/apigateway/create-api-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/apigateway/create-authorizer.rst
@@ -314,18 +347,151 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/apigateway/update-stage.rst
 #usr/lib/python3.8/site-packages/awscli/examples/apigateway/update-usage-plan.rst
 #usr/lib/python3.8/site-packages/awscli/examples/apigateway/update-usage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewaymanagementapi
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewaymanagementapi/delete-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewaymanagementapi/get-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewaymanagementapi/post-to-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-api-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-domain-name.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-integration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-stage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/create-vpc-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-access-log-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-api-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-cors-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-domain-name.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-integration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-route-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-stage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/delete-vpc-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/export-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-api-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-api-mappings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-apis.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-authorizers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-deployments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-domain-name.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-domain-names.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-integration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-integrations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-routes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-stage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-stages.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-vpc-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/get-vpc-links.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/import-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/reimport-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-api-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-api.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-domain-name.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-integration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-stage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/apigatewayv2/update-vpc-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appconfig
+#usr/lib/python3.8/site-packages/awscli/examples/appconfig/get-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appconfig/list-applications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appconfig/list-configuration-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appconfig/list-environments.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/delete-scaling-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/delete-scheduled-action.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/deregister-scalable-target.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/describe-scalable-targets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/describe-scaling-activities.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/describe-scaling-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/describe-scheduled-actions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/put-scaling-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/put-scheduled-action.rst
 #usr/lib/python3.8/site-packages/awscli/examples/application-autoscaling/register-scalable-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/create-mesh.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/create-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/create-virtual-node.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/create-virtual-router.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/create-virtual-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/delete-mesh.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/delete-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/delete-virtual-node.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/delete-virtual-router.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/delete-virtual-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/describe-mesh.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/describe-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/describe-virtual-node.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/describe-virtual-router.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/describe-virtual-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/list-meshes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/list-routes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/list-virtual-nodes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/list-virtual-routers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/list-virtual-services.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/update-mesh.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/update-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/update-virtual-node.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/update-virtual-router.rst
+#usr/lib/python3.8/site-packages/awscli/examples/appmesh/update-virtual-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena
+#usr/lib/python3.8/site-packages/awscli/examples/athena/batch-get-named-query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/batch-get-query-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/create-data-catalog.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/create-named-query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/create-work-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/delete-data-catalog.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/delete-named-query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/delete-work-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-data-catalog.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-named-query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-query-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-query-results.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-table-metadata.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/get-work-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-data-catalogs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-databases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-named-queries.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-query-executions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-table-metadata.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/list-work-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/start-query-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/stop-query-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/update-data-catalog.rst
+#usr/lib/python3.8/site-packages/awscli/examples/athena/update-work-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans/create-scaling-plan.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans/delete-scaling-plan.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans/describe-scaling-plan-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans/describe-scaling-plans.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans/get-scaling-plan-resource-forecast-data.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling-plans/update-scaling-plan.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/attach-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/attach-load-balancer-target-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/attach-load-balancers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling/cancel-instance-refresh.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/complete-lifecycle-action.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/create-auto-scaling-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/create-launch-configuration.rst
@@ -342,6 +508,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-auto-scaling-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-auto-scaling-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-auto-scaling-notification-types.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-instance-refreshes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-launch-configurations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-lifecycle-hook-types.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/describe-lifecycle-hooks.rst
@@ -372,9 +539,16 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/set-desired-capacity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/set-instance-health.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/set-instance-protection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/autoscaling/start-instance-refresh.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/suspend-processes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/terminate-instance-in-auto-scaling-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/autoscaling/update-auto-scaling-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/backup
+#usr/lib/python3.8/site-packages/awscli/examples/backup/create-backup-plan.rst
+#usr/lib/python3.8/site-packages/awscli/examples/backup/create-backup-vault.rst
+#usr/lib/python3.8/site-packages/awscli/examples/backup/get-backup-plan-from-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/backup/get-backup-plan.rst
+#usr/lib/python3.8/site-packages/awscli/examples/backup/list-backup-jobs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/batch
 #usr/lib/python3.8/site-packages/awscli/examples/batch/cancel-job.rst
 #usr/lib/python3.8/site-packages/awscli/examples/batch/create-compute-environment.rst
@@ -392,6 +566,118 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/batch/terminate-job.rst
 #usr/lib/python3.8/site-packages/awscli/examples/batch/update-compute-environment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/batch/update-job-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/create-budget.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/create-notification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/create-subscriber.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/delete-budget.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/delete-notification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/delete-subscriber.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/describe-budget.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/describe-budgets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/describe-notifications-for-budget.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/describe-subscribers-for-notification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/update-budget.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/update-notification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/budgets/update-subscriber.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ce
+#usr/lib/python3.8/site-packages/awscli/examples/ce/get-cost-and-usage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ce/get-dimension-values.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ce/get-reservation-coverage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ce/get-reservation-purchase-recommendation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ce/get-reservation-utilization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ce/get-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime
+#usr/lib/python3.8/site-packages/awscli/examples/chime/associate-phone-number-with-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/associate-phone-numbers-with-voice-connector-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/associate-phone-numbers-with-voice-connector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/associate-signin-delegate-groups-with-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/batch-create-room-membership.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/batch-delete-phone-number.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/batch-suspend-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/batch-unsuspend-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/batch-update-phone-number.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/batch-update-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-bot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-phone-number-order.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-proxy-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-room-membership.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-room.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-voice-connector-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/create-voice-connector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-phone-number.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-proxy-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-room-membership.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-room.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector-origination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector-proxy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector-streaming-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector-termination-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector-termination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/delete-voice-connector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/disassociate-phone-number-from-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/disassociate-phone-numbers-from-voice-connector-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/disassociate-phone-numbers-from-voice-connector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/disassociate-signin-delegate-groups-from-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-account-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-bot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-global-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-phone-number-order.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-phone-number-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-phone-number.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-proxy-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-room.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-user-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-logging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-origination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-proxy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-streaming-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-termination-health.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector-termination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/get-voice-connector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/invite-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-accounts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-bots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-phone-number-orders.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-phone-numbers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-proxy-sessions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-room-memberships.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-rooms.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-voice-connector-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-voice-connector-termination-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/list-voice-connectors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/logout-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/put-voice-connector-logging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/put-voice-connector-origination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/put-voice-connector-proxy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/put-voice-connector-streaming-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/put-voice-connector-termination-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/put-voice-connector-termination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/regenerate-security-token.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/reset-personal-pin.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/restore-phone-number.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/search-available-phone-numbers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-account-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-bot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-global-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-phone-number-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-phone-number.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-proxy-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-room-membership.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-room.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-user-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-voice-connector-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/chime/update-voice-connector.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloud9
 #usr/lib/python3.8/site-packages/awscli/examples/cloud9/create-environment-ec2.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloud9/create-environment-membership.rst
@@ -407,24 +693,108 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/_deploy_description.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/_package_description.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/cancel-update-stack.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/continue-update-rollback.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/create-change-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/create-stack-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/create-stack-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/create-stack.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/delete-change-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/delete-stack-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/delete-stack-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/delete-stack.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/deploy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/deregister-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-account-limits.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-change-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-drift-detection-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-resource-drifts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-set-operation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stack-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-stacks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-type-registration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/describe-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/detect-stack-drift.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/detect-stack-resource-drift.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/detect-stack-set-drift.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/estimate-template-cost.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/execute-change-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/get-stack-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/get-template-summary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/get-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-change-sets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-exports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-imports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-stack-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-stack-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-stack-set-operation-results.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-stack-set-operations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-stack-sets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-stacks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-type-registrations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-type-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/list-types.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/package.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/register-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/set-stack-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/set-type-default-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/signal-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/stop-stack-set-operation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/update-stack-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/update-stack-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/update-stack.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/update-termination-protection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudformation/validate-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/change-set-create-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/stack-create-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/stack-delete-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/stack-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/stack-import-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/stack-rollback-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/stack-update-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudformation/wait/type-registration-complete.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-cloud-front-origin-access-identity.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-distribution-with-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-distribution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-field-level-encryption-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-field-level-encryption-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-invalidation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/create-public-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/delete-cloud-front-origin-access-identity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/delete-distribution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/delete-field-level-encryption-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/delete-field-level-encryption-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/delete-public-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-cloud-front-origin-access-identity-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-cloud-front-origin-access-identity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-distribution-config.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-distribution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-field-level-encryption-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-field-level-encryption-profile-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-field-level-encryption-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-field-level-encryption.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-invalidation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-public-key-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/get-public-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-cloud-front-origin-access-identities.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-distributions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-field-level-encryption-configs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-field-level-encryption-profiles.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-invalidations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-public-keys.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/sign.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/update-cloud-front-origin-access-identity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudfront/update-distribution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/update-field-level-encryption-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cloudfront/update-field-level-encryption-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudsearchdomain
 #usr/lib/python3.8/site-packages/awscli/examples/cloudsearchdomain/upload-documents.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudtrail
@@ -457,38 +827,121 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/cloudwatch/put-metric-alarm.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudwatch/put-metric-data.rst
 #usr/lib/python3.8/site-packages/awscli/examples/cloudwatch/set-alarm-state.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/batch-delete-builds.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/batch-get-build-batches.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/batch-get-builds.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/batch-get-projects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/batch-get-report-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/batch-get-reports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/create-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/create-report-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/create-webhook.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/delete-build-batch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/delete-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/delete-report-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/delete-report.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/delete-source-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/delete-webhook.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/describe-code-coverages.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/describe-test-cases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/import-source-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/invalidate-project-cache.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-build-batches-for-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-build-batches.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-builds-for-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-builds.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-curated-environment-images.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-projects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-report-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-reports-for-report-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-reports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-shared-projects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-shared-report-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/list-source-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/retry-build-batch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/retry-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/start-build-batch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/start-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/stop-build-batch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/stop-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/update-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/update-report-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codebuild/update-webhook.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/associate-approval-rule-template-with-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/batch-associate-approval-rule-template-with-repositories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/batch-describe-merge-conflicts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/batch-disassociate-approval-rule-template-from-repositories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/batch-get-commits.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/batch-get-repositories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-approval-rule-template.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-branch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-commit.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-pull-request-approval-rule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-pull-request.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/create-unreferenced-merge-commit.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/credential-helper.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/delete-approval-rule-template.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/delete-branch.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/delete-comment-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/delete-file.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/delete-pull-request-approval-rule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/delete-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/describe-merge-conflicts.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/describe-pull-request-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/disassociate-approval-rule-template-from-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/evaluate-pull-request-approval-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-approval-rule-template.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-blob.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-branch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-comment-reactions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-comment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-comments-for-compared-commit.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-comments-for-pull-request.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-commit.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-differences.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-file.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-folder.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-merge-commit.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-merge-conflicts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-merge-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-pull-request-approval-states.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-pull-request-override-state.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-pull-request.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-repository-triggers.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/get-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-approval-rule-templates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-associated-approval-rule-templates-for-repository.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-branches.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-pull-requests.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-repositories-for-approval-rule-template.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-repositories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/merge-branches-by-fast-forward.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/merge-branches-by-squash.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/merge-branches-by-three-way.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/merge-pull-request-by-fast-forward.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/merge-pull-request-by-squash.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/merge-pull-request-by-three-way.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/override-pull-request-approval-rules.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/post-comment-for-compared-commit.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/post-comment-for-pull-request.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/post-comment-reply.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/put-comment-reaction.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/put-file.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/put-repository-triggers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/tag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/test-repository-triggers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-approval-rule-template-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-approval-rule-template-description.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-approval-rule-template-name.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-comment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-default-branch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-pull-request-approval-rule-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-pull-request-approval-state.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-pull-request-description.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-pull-request-status.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codecommit/update-pull-request-title.rst
@@ -500,16 +953,174 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/create-pipeline.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/delete-custom-action-type.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/delete-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/delete-webhook.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/deregister-webhook-with-third-party.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/disable-stage-transition.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/enable-stage-transition.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/get-job-details.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/get-pipeline-state.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/get-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/list-action-executions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/list-action-types.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/list-pipeline-executions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/list-pipelines.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/list-webhooks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/poll-for-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/put-webhook.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/retry-stage-execution.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/start-pipeline-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/stop-pipeline-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codepipeline/untag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/codepipeline/update-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/create-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/create-host.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/delete-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/delete-host.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/get-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/get-host.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/list-connections.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/list-hosts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-connections/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/create-notification-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/delete-notification-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/delete-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/describe-notification-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/list-event-types.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/list-notification-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/list-targets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/subscribe.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/unsubscribe.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar-notifications/update-notification-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/associate-team-member.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/create-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/create-user-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/delete-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/delete-user-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/describe-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/describe-user-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/disassociate-team-member.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/list-projects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/list-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/list-tags-for-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/list-team-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/list-user-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/tag-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/untag-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/update-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/update-team-member.rst
+#usr/lib/python3.8/site-packages/awscli/examples/codestar/update-user-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/create-identity-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/delete-identities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/delete-identity-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/describe-identity-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/get-identity-pool-roles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/list-identity-pools.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/set-identity-pool-roles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-identity/update-identity-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/add-custom-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admim-disable-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admim-enable-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-add-user-to-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-confirm-sign-up.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-create-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-delete-user-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-delete-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-forget-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-get-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-get-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-initiate-auth.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-list-devices.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-list-groups-for-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-list-user-auth-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-remove-user-from-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-reset-user-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-set-user-mfa-preference.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-set-user-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-update-auth-event-feedback.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-update-device-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/admin-update-user-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/change-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/confirm-forgot-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/confirm-sign-up.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/create-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/create-user-import-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/create-user-pool-client.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/create-user-pool-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/create-user-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-identity-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-resource-server.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-user-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-user-pool-client.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-user-pool-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-user-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/delete-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-identity-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-resource-server.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-risk-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-user-import-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-user-pool-client.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-user-pool-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/describe-user-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/forget-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/forgot-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/get-csv-header.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/get-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/get-signing-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/get-ui-customization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/list-user-import-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/list-user-pools.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/list-users-in-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/list-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/resend-confirmation-code.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/respond-to-auth-challenge.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/set-risk-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/set-ui-customization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/set-user-mfa-preference.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/set-user-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/sign-up.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/start-user-import-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/stop-user-import-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-auth-event-feedback.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-device-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-resource-server.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-user-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-user-pool-client.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cognito-idp/update-user-pool.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/describe-entities-detection-v2-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/describe-icd10-cm-inference-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/describe-phi-detection-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/describe-rx-norm-inference-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/detect-entities-v2.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/detect-phi.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/infer-icd10-cm.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/infer-rx-norm.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/list-entities-detection-v2-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/list-icd10-cm-inference-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/list-phi-detection-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/list-rx-norm-inference-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/start-entities-detection-v2-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/start-icd10-cm-inference-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/start-phi-detection-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/start-rx-norm-inference-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/stop-entities-detection-v2-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/stop-icd10-cm-inference-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/stop-phi-detection-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/comprehendmedical/stop-rx-norm-inference-job.rst
 #usr/lib/python3.8/site-packages/awscli/examples/configservice
 #usr/lib/python3.8/site-packages/awscli/examples/configservice/delete-config-rule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/configservice/delete-delivery-channel.rst
@@ -546,6 +1157,31 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/configure/set
 #usr/lib/python3.8/site-packages/awscli/examples/configure/set/_description.rst
 #usr/lib/python3.8/site-packages/awscli/examples/configure/set/_examples.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect
+#usr/lib/python3.8/site-packages/awscli/examples/connect/create-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/delete-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/describe-user-hierarchy-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/describe-user-hierarchy-structure.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/describe-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/get-contact-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-contact-flows.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-hours-of-operations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-phone-numbers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-queues.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-routing-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-security-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-user-hierarchy-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/list-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/update-contact-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/update-user-hierarchy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/update-user-identity-info.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/update-user-phone-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/update-user-routing-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/connect/update-user-security-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cur
+#usr/lib/python3.8/site-packages/awscli/examples/cur/delete-report-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cur/describe-report-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/cur/put-report-definition.rst
 #usr/lib/python3.8/site-packages/awscli/examples/datapipeline
 #usr/lib/python3.8/site-packages/awscli/examples/datapipeline/activate-pipeline.rst
 #usr/lib/python3.8/site-packages/awscli/examples/datapipeline/add-tags.rst
@@ -558,11 +1194,33 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/datapipeline/list-runs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/datapipeline/put-pipeline-definition.rst
 #usr/lib/python3.8/site-packages/awscli/examples/datapipeline/remove-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax
+#usr/lib/python3.8/site-packages/awscli/examples/dax/create-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/create-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/create-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/decrease-replication-factor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/delete-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/delete-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/delete-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/describe-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/describe-default-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/describe-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/describe-parameter-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/describe-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/describe-subnet-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/increase-replication-factor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/list-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dax/untag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/add-tags-to-on-premises-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/batch-get-application-revisions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/batch-get-applications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/batch-get-deployment-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/batch-get-deployment-targets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/batch-get-deployments.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/batch-get-on-premises-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/continue-deployment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/create-application.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/create-deployment-config.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/create-deployment-group.rst
@@ -570,6 +1228,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/delete-application.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/delete-deployment-config.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/delete-deployment-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/delete-git-hub-account-token.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/deregister-on-premises-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/deregister.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/get-application-revision.rst
@@ -577,6 +1236,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/get-deployment-config.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/get-deployment-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/get-deployment-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/get-deployment-target.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/get-deployment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/get-on-premises-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/install.rst
@@ -585,17 +1245,36 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/list-deployment-configs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/list-deployment-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/list-deployment-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/list-deployment-targets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/list-deployments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/list-git-hub-account-token-names.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/list-on-premises-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/list-tags-for-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/push.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/register-application-revision.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/register-on-premises-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/register.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/remove-tags-from-on-premises-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/stop-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/tag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/uninstall.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/untag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/update-application.rst
 #usr/lib/python3.8/site-packages/awscli/examples/deploy/update-deployment-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/wait
+#usr/lib/python3.8/site-packages/awscli/examples/deploy/wait/deployment-successful.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective
+#usr/lib/python3.8/site-packages/awscli/examples/detective/accept-invitation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/create-graph.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/create-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/delete-graph.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/delete-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/disassociate-membership.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/get-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/list-graphs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/list-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/list-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/detective/reject-invitation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/devicefarm
 #usr/lib/python3.8/site-packages/awscli/examples/devicefarm/create-device-pool.rst
 #usr/lib/python3.8/site-packages/awscli/examples/devicefarm/create-project.rst
@@ -603,24 +1282,29 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/devicefarm/get-upload.rst
 #usr/lib/python3.8/site-packages/awscli/examples/devicefarm/list-projects.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/accept-direct-connect-gateway-association-proposal.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/allocate-connection-on-interconnect.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/allocate-hosted-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/allocate-private-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/allocate-public-virtual-interface.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/allocate-transit-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/associate-connection-with-lag.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/associate-hosted-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/associate-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/confirm-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/confirm-private-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/confirm-public-virtual-interface.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/confirm-transit-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-bgp-peer.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-direct-connect-gateway-association-proposal.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-direct-connect-gateway-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-direct-connect-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-interconnect.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-lag.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-private-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-public-virtual-interface.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/create-transit-virtual-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/delete-bgp-peer.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/delete-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/delete-direct-connect-gateway-association.rst
@@ -631,6 +1315,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-connection-loa.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-connections-on-interconnect.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-connections.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-direct-connect-gateway-association-proposals.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-direct-connect-gateway-associations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-direct-connect-gateway-attachments.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/describe-direct-connect-gateways.rst
@@ -646,67 +1331,212 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/disassociate-connection-from-lag.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/tag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/update-direct-connect-gateway-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/directconnect/update-lag.rst
+#usr/lib/python3.8/site-packages/awscli/examples/directconnect/update-virtual-interface-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/discovery
 #usr/lib/python3.8/site-packages/awscli/examples/discovery/describe-agents.rst
 #usr/lib/python3.8/site-packages/awscli/examples/discovery/describe-configurations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/discovery/list-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dlm
+#usr/lib/python3.8/site-packages/awscli/examples/dlm/create-default-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dlm/create-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dlm/delete-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dlm/get-lifecycle-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dlm/get-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dlm/update-lifecycle-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dms
+#usr/lib/python3.8/site-packages/awscli/examples/dms/add-tags-to-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dms/create-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/create-event-subscription.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dms/create-replication-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/create-replication-subnet-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dms/create-replication-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/delete-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/delete-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/delete-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/delete-replication-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/delete-replication-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/delete-replication-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-account-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-certificates.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dms/describe-connections.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-endpoint-types.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dms/describe-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-event-categories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-event-subscriptions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-orderable-replication-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-refresh-schemas-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-replication-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-replication-subnet-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-replication-task-assessment-results.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-replication-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/describe-schemas.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/modify-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/modify-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/modify-replication-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/modify-replication-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/modify-replication-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/reboot-replication-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/refresh-schemas.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/reload-tables.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/remove-tags-from-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/start-replication-task-assessment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/start-replication-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/stop-replication-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dms/test-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/add-tags-to-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/apply-pending-maintenance-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/copy-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/copy-db-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/create-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/create-db-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/create-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/create-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/create-db-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/delete-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/delete-db-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/delete-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/delete-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/delete-db-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-cluster-parameter-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-cluster-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-cluster-snapshot-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-cluster-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-engine-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-db-subnet-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-engine-default-cluster-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-event-categories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-orderable-db-instance-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/describe-pending-maintenance-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/failover-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/modify-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/modify-db-cluster-snapshot-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/modify-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/modify-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/modify-db-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/reboot-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/remove-tags-from-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/reset-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/restore-db-cluster-from-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/restore-db-cluster-to-point-in-time.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/start-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/stop-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/wait
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/wait/db-instance-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/docdb/wait/db-instance-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ds
+#usr/lib/python3.8/site-packages/awscli/examples/ds/describe-directories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ds/describe-trusts.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/batch-get-item.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/batch-write-item.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/create-backup.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/create-global-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/create-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/delete-backup.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/delete-item.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/delete-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-backup.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-continuous-backups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-contributor-insights.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-global-table-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-global-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-limits.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-table-replica-auto-scaling.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/describe-time-to-live.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/get-item.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/list-backups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/list-contributor-insights.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/list-global-tables.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/list-tables.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/list-tags-of-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/put-item.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/restore-table-from-backup.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/restore-table-to-point-in-time.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/scan.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/transact-get-items.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/transact-write-items.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-continuous-backups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-contributor-insights.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-global-table-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-global-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-item.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-table-replica-auto-scaling.rst
 #usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/update-time-to-live.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/wait
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodb/wait/table-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodbstreams
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodbstreams/describe-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodbstreams/get-records.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodbstreams/get-shard-iterator.rst
+#usr/lib/python3.8/site-packages/awscli/examples/dynamodbstreams/list-streams.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2
+#usr/lib/python3.8/site-packages/awscli/examples/ec2-instance-connect
+#usr/lib/python3.8/site-packages/awscli/examples/ec2-instance-connect/send-ssh-public-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/accept-reserved-instances-exchange-quote.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/accept-transit-gateway-peering-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/accept-transit-gateway-vpc-attachment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/accept-vpc-endpoint-connections.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/accept-vpc-peering-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/advertise-byoip-cidr.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/allocate-address.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/allocate-hosts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/apply-security-groups-to-client-vpn-target-network.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/assign-ipv6-addresses.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/assign-private-ip-addresses.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-address.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-client-vpn-target-network.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-dhcp-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-iam-instance-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-route-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-subnet-cidr-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-transit-gateway-multicast-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-transit-gateway-route-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/associate-vpc-cidr-block.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/attach-classic-link-vpc.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/attach-internet-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/attach-network-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/attach-volume.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/attach-vpn-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/authorize-client-vpn-ingress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/authorize-security-group-egress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/authorize-security-group-ingress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/bundle-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-bundle-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-capacity-reservation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-conversion-task.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-export-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-import-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-reserved-instances-listing.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-spot-fleet-requests.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/cancel-spot-instance-requests.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/confirm-product-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/copy-fpga-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/copy-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/copy-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-capacity-reservation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-client-vpn-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-client-vpn-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-customer-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-default-subnet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-default-vpc.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-dhcp-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-egress-only-internet-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-fleet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-flow-logs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-fpga-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-image.rst
@@ -715,19 +1545,34 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-key-pair.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-launch-template-version.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-launch-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-local-gateway-route-table-vpc-association.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-local-gateway-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-managed-prefix-list.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-nat-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-network-acl-entry.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-network-acl.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-network-interface-permission.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-network-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-placement-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-reserved-instances-listing.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-route-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-security-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-snapshots.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-spot-datafeed-subscription.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-subnet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-traffic-mirror-filter-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-traffic-mirror-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-traffic-mirror-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-traffic-mirror-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-transit-gateway-peering-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-transit-gateway-prefix-list-reference.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-transit-gateway-route-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-transit-gateway-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-transit-gateway-vpc-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/create-transit-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-volume.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-vpc-endpoint-connection-notification.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-vpc-endpoint-service-configuration.rst
@@ -737,21 +1582,27 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-vpn-connection-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-vpn-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/create-vpn-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-client-vpn-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-client-vpn-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-customer-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-dhcp-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-egress-only-internet-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-fleets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-flow-logs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-fpga-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-internet-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-key-pair.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-launch-template-versions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-launch-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-local-gateway-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-managed-prefix-list.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-nat-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-network-acl-entry.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-network-acl.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-network-interface-permission.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-network-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-placement-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-queued-reserved-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-route-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-security-group.rst
@@ -759,6 +1610,17 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-spot-datafeed-subscription.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-subnet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-traffic-mirror-filter-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-traffic-mirror-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-traffic-mirror-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-traffic-mirror-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway-multicast-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway-peering-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway-prefix-list-reference.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway-route-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway-vpc-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-transit-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-volume.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-vpc-endpoint-connection-notifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-vpc-endpoint-service-configurations.rst
@@ -768,19 +1630,35 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-vpn-connection-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-vpn-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/delete-vpn-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/deprovision-byoip-cidr.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/deregister-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/deregister-instance-event-notification-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/deregister-transit-gateway-multicast-group-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/deregister-transit-gateway-multicast-group-source.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-account-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-addresses.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-aggregate-id-format.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-availability-zones.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-bundle-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-byoip-cidrs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-capacity-reservations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-classic-link-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-client-vpn-authorization-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-client-vpn-connections.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-client-vpn-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-client-vpn-routes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-client-vpn-target-networks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-conversion-tasks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-customer-gateways.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-dhcp-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-egress-only-internet-gateways.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-elastic-gpus.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-export-image-tasks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-export-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-fast-snapshot-restores.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-fleet-history.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-fleet-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-fleets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-flow-logs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-fpga-image-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-fpga-images.rst
@@ -792,14 +1670,24 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-identity-id-format.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-image-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-images.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-import-image-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-import-snapshot-tasks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instance-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instance-credit-specifications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instance-event-notification-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instance-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instance-type-offerings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instance-types.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-internet-gateways.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-ipv6-pools.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-key-pairs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-launch-template-versions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-launch-templates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-local-gateway-route-table-vpc-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-local-gateway-route-tables.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-local-gateways.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-managed-prefix-lists.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-moving-addresses.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-nat-gateways.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-network-acls.rst
@@ -809,7 +1697,9 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-placement-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-prefix-lists.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-principal-id-format.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-public-ipv4-pools.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-regions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-reserved-instances-listings.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-reserved-instances-modifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-reserved-instances-offerings.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-reserved-instances.rst
@@ -829,8 +1719,17 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-stale-security-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-subnets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-traffic-mirror-filters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-traffic-mirror-sessions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-traffic-mirror-targets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-transit-gateway-attachments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-transit-gateway-peering-attachments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-transit-gateway-route-tables.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-transit-gateway-vpc-attachments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-transit-gateways.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-volume-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-volume-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-volumes-modifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-volumes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-vpc-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/describe-vpc-classic-link-dns-support.rst
@@ -850,39 +1749,85 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/detach-network-interface.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/detach-volume.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/detach-vpn-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/disable-ebs-encryption-by-default.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/disable-fast-snapshot-restores.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/disable-transit-gateway-route-table-propagation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disable-vgw-route-propagation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disable-vpc-classic-link-dns-support.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disable-vpc-classic-link.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-address.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-client-vpn-target-network.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-iam-instance-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-route-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-subnet-cidr-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-transit-gateway-multicast-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-transit-gateway-route-table.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/disassociate-vpc-cidr-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-ebs-encryption-by-default.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-fast-snapshot-restores.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-transit-gateway-route-table-propagation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-vgw-route-propagation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-volume-io.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/enable-vpc-classic-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/export-client-vpn-client-certificate-revocation-list.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/export-client-vpn-client-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/export-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-associated-ipv6-pool-cidrs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-capacity-reservation-usage.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/get-console-output.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-console-screenshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-default-credit-specification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-ebs-default-kms-key-id.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-ebs-encryption-by-default.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-groups-for-capacity-reservation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/get-host-reservation-purchase-preview.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/get-launch-template-data.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-managed-prefix-list-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-managed-prefix-list-entries.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/get-password-data.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/get-reserved-instances-exchange-quote.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-transit-gateway-attachment-propagations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-transit-gateway-multicast-domain-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-transit-gateway-prefix-list-references.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-transit-gateway-route-table-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/get-transit-gateway-route-table-propagations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/import-client-vpn-client-certificate-revocation-list.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/import-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/import-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/import-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-availability-zone-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-capacity-reservation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-client-vpn-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-default-credit-specification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-ebs-default-kms-key-id.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-fleet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-fpga-image-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-hosts.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-id-format.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-identity-id-format.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-image-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-instance-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-instance-capacity-reservation-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-instance-credit-specification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-instance-event-start-time.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-instance-metadata-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-instance-placement.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-launch-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-managed-prefix-list.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-network-interface-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-reserved-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-snapshot-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-spot-fleet-request.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-subnet-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-traffic-mirror-filter-network-services.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-traffic-mirror-filter-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-traffic-mirror-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-transit-gateway-prefix-list-reference.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-transit-gateway-vpc-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-transit-gateway.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-volume-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-volume.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpc-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpc-endpoint-connection-notification.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpc-endpoint-service-configuration.rst
@@ -890,86 +1835,264 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpc-endpoint.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpc-peering-connection-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpc-tenancy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpn-connection-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpn-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpn-tunnel-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/modify-vpn-tunnel-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/monitor-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/move-address-to-vpc.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/provision-byoip-cidr.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/purchase-host-reservation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/purchase-reserved-instance-offering.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/purchase-reserved-instances-offering.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/purchase-scheduled-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reboot-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/register-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/register-instance-event-notification-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/register-transit-gateway-multicast-group-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/register-transit-gateway-multicast-group-source.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/reject-transit-gateway-peering-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/reject-transit-gateway-vpc-attachments.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reject-vpc-endpoint-connections.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reject-vpc-peering-connection.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/release-address.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/release-hosts.rst
-#usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-iam-instance-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-iam-instance-profile-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-network-acl-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-network-acl-entry.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-route-table-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-route.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/replace-transit-gateway-route.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/report-instance-status.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/request-spot-fleet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/request-spot-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/reset-ebs-default-kms-key-id.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reset-fpga-image-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reset-image-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reset-instance-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/reset-network-interface-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/reset-snapshot-attribute.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/restore-address-to-classic.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/restore-managed-prefix-list-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/revoke-client-vpn-ingress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/revoke-security-group-egress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/revoke-security-group-ingress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/run-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/run-scheduled-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/search-local-gateway-routes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/search-transit-gateway-multicast-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/search-transit-gateway-routes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/send-diagnostic-interrupt.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/start-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/stop-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/terminate-client-vpn-connections.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/terminate-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/unassign-ipv6-addresses.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/unassign-private-ip-addresses.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/unmonitor-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/update-security-group-rule-descriptions-egress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ec2/update-security-group-rule-descriptions-ingress.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/bundle-task-complete.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/conversion-task-cancelled.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/conversion-task-completed.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/conversion-task-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/customer-gateway-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/export-task-cancelled.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/export-task-completed.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/image-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/image-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/instance-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/instance-running.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/instance-status-ok.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/instance-stopped.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/instance-terminated.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/key-pair-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/nat-gateway-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/network-interface-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/password-data-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/security-group-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/snapshot-completed.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/spot-instance-request-fulfilled.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/subnet-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/system-status-ok.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/volume-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/volume-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/volume-in-use.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/vpc-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/vpc-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/vpc-peering-connection-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/vpc-peering-connection-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/vpn-connection-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/wait/vpn-connection-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ec2/withdraw-byoip-cidr.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr
+#usr/lib/python3.8/site-packages/awscli/examples/ecr-public
+#usr/lib/python3.8/site-packages/awscli/examples/ecr-public/get-login-password_description.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/batch-check-layer-availability.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/batch-delete-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/batch-get-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/complete-layer-upload.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/create-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/delete-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/delete-repository-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/delete-repository.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/describe-image-scan-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/describe-images.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/describe-repositories.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/get-authorization-token.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/get-download-url-for-layer.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/get-lifecycle-policy-preview.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/get-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/get-login-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/get-login-password_description.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/get-login.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/get-login_description.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/get-repository-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/initiate-layer-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/list-images.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/put-image-scanning-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/put-image-tag-mutability.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/put-image.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/put-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/set-repository-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/start-image-scan.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecr/start-lifecycle-policy-preview.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecr/upload-layer-part.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/create-capacity-provider.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/create-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/create-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/create-task-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/delete-account-setting.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/delete-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/delete-capacity-provider.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/delete-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/delete-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/delete-task-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/deregister-container-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/deregister-task-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-capacity-providers.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-clusters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-container-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-services.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-task-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-task-sets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/describe-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/list-account-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/list-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/list-clusters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/list-container-instances.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/list-services.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/list-tags-for-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/list-task-definition-families.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/list-task-definitions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/list-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/put-account-setting-default.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/put-account-setting.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/put-account-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/put-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/put-cluster-capacity-providers.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/register-task-definition.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/run-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/start-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/stop-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/update-cluster-settings.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/update-container-agent.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/update-container-instances-state.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/update-service-primary-task-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ecs/update-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/update-task-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/wait
+#usr/lib/python3.8/site-packages/awscli/examples/ecs/wait/services-stable.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs
+#usr/lib/python3.8/site-packages/awscli/examples/efs/create-file-system.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/create-mount-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/delete-file-system.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/delete-mount-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/describe-file-systems.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/describe-mount-targets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/describe-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/efs/untag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/eks
 #usr/lib/python3.8/site-packages/awscli/examples/eks/create-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/eks/delete-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/eks/describe-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/describe-update.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/get-token.rst
 #usr/lib/python3.8/site-packages/awscli/examples/eks/list-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/list-updates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/update-cluster-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/update-cluster-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/update-kubeconfig
+#usr/lib/python3.8/site-packages/awscli/examples/eks/update-kubeconfig.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/update-kubeconfig/_description.rst
+#usr/lib/python3.8/site-packages/awscli/examples/eks/wait.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticache
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/add-tags-to-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/authorize-cache-security-group-ingress.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/batch-apply-update-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/batch-stop-update-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/copy-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-cache-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-cache-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-cache-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-global-replication-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-user-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/create-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/decrease-node-groups-in-global-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/decrease-replica-count.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-cache-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-cache-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-cache-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-global-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-user-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/delete-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-cache-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-cache-engine-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-cache-parameter-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-cache-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-cache-subnet-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-engine-default-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-global-replication-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-replication-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-reserved-cache-nodes-offerings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-reserved-cache-nodes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-service-updates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-update-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-user-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/describe-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/disassociate-global-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/increase-node-groups-in-global-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/increase-replica-count.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/list-allowed-node-type-modifications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-cache-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-cache-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-cache-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-global-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-replication-group-shard-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-replication-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-user-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/modify-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/purchase-reserved-cache-nodes-offering.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/reboot-cache-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/reset-cache-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/start-migration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elasticache/test-failover.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticbeanstalk
 #usr/lib/python3.8/site-packages/awscli/examples/elasticbeanstalk/abort-environment-update.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticbeanstalk/check-dns-availability.rst
@@ -1003,6 +2126,23 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/elasticbeanstalk/update-configuration-template.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticbeanstalk/update-environment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elasticbeanstalk/validate-configuration-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/cancel-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/create-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/create-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/create-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/delete-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/delete-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/list-jobs-by-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/list-jobs-by-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/list-pipelines.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/list-presets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/read-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/read-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/read-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/update-pipeline-notifications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/update-pipeline-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elastictranscoder/update-pipeline.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb
 #usr/lib/python3.8/site-packages/awscli/examples/elb/add-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/apply-security-groups-to-load-balancer.rst
@@ -1017,6 +2157,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/elb/delete-load-balancer-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/delete-load-balancer.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/deregister-instances-from-load-balancer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elb/describe-account-limits.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/describe-instance-health.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/describe-load-balancer-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/describe-load-balancer-policies.rst
@@ -1032,6 +2173,10 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/elb/set-load-balancer-listener-ssl-certificate.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/set-load-balancer-policies-for-backend-server.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elb/set-load-balancer-policies-of-listener.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elb/wait
+#usr/lib/python3.8/site-packages/awscli/examples/elb/wait/any-instance-in-service.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elb/wait/instance-deregistered.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elb/wait/instance-in-service.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elbv2
 #usr/lib/python3.8/site-packages/awscli/examples/elbv2/add-listener-certificates.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elbv2/add-tags.rst
@@ -1067,12 +2212,18 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/elbv2/set-rule-priorities.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elbv2/set-security-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/elbv2/set-subnets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elbv2/wait
+#usr/lib/python3.8/site-packages/awscli/examples/elbv2/wait/load-balancer-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elbv2/wait/load-balancer-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elbv2/wait/load-balancers-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elbv2/wait/target-deregistered.rst
+#usr/lib/python3.8/site-packages/awscli/examples/elbv2/wait/target-in-service.rst
 #usr/lib/python3.8/site-packages/awscli/examples/emr
 #usr/lib/python3.8/site-packages/awscli/examples/emr/add-instance-fleet.rst
 #usr/lib/python3.8/site-packages/awscli/examples/emr/add-steps.rst
 #usr/lib/python3.8/site-packages/awscli/examples/emr/add-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/emr/create-cluster-examples.rst
-#usr/lib/python3.8/site-packages/awscli/examples/emr/create-cluster-synopsis.rst
+#usr/lib/python3.8/site-packages/awscli/examples/emr/create-cluster-synopsis.txt
 #usr/lib/python3.8/site-packages/awscli/examples/emr/create-default-roles.rst
 #usr/lib/python3.8/site-packages/awscli/examples/emr/create-security-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/emr/delete-security-configuration.rst
@@ -1094,6 +2245,11 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/emr/wait.rst
 #usr/lib/python3.8/site-packages/awscli/examples/es
 #usr/lib/python3.8/site-packages/awscli/examples/es/create-elasticsearch-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/es/describe-elasticsearch-domain-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/es/describe-elasticsearch-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/es/describe-elasticsearch-domains.rst
+#usr/lib/python3.8/site-packages/awscli/examples/es/describe-reserved-elasticsearch-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/es/list-domain-names.rst
 #usr/lib/python3.8/site-packages/awscli/examples/events
 #usr/lib/python3.8/site-packages/awscli/examples/events/delete-rule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/events/describe-rule.rst
@@ -1107,29 +2263,243 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/events/put-targets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/events/remove-targets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/events/test-event-pattern.rst
+#usr/lib/python3.8/site-packages/awscli/examples/firehose
+#usr/lib/python3.8/site-packages/awscli/examples/firehose/list-delivery-streams.rst
+#usr/lib/python3.8/site-packages/awscli/examples/firehose/put-record-batch.rst
+#usr/lib/python3.8/site-packages/awscli/examples/firehose/put-record.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms
+#usr/lib/python3.8/site-packages/awscli/examples/fms/associate-admin-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/delete-notification-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/delete-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/disassociate-admin-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/get-admin-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/get-compliance-detail.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/get-notification-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/get-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/list-compliance-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/list-member-accounts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/list-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/put-notification-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/fms/put-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/create-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/create-fleet.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/create-game-session-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/delete-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/delete-fleet.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/delete-game-session-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-ec2-instance-limits.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-fleet-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-fleet-capacity.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-fleet-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-fleet-port-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-fleet-utilization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-game-session-queues.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/describe-runtime-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/list-builds.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/list-fleets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/request-upload-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/start-fleet-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/stop-fleet-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/update-build.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/update-game-session-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/gamelift/upload-build.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/abort-multipart-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/abort-vault-lock.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/add-tags-to-vault.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/complete-multipart-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/complete-vault-lock.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/create-vault.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/delete-archive.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/delete-vault-access-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/delete-vault-notifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/delete-vault.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/describe-job.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/describe-vault.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/get-data-retrieval-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/get-job-output.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/get-vault-access-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/get-vault-lock.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/get-vault-notifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/initiate-job.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/initiate-multipart-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/initiate-vault-lock.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/list-jobs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/list-multipart-uploads.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/list-parts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/list-provisioned-capacity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/list-tags-for-vault.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/list-vaults.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/purchase-provisioned-capacity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/remove-tags-from-vault.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/set-data-retrieval-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/set-vault-access-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/set-vault-notifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/upload-archive.rst
 #usr/lib/python3.8/site-packages/awscli/examples/glacier/upload-multipart-part.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/wait
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/wait/vault-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glacier/wait/vault-not-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/advertise-byoip-cidr.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/create-accelerator.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/create-endpoint-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/create-listener.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/deprovision-byoip-cidr.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/describe-accelerator-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/describe-accelerator.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/describe-endpoint-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/describe-listener.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/list-accelerators.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/list-byoip-cidr.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/list-endpoint-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/list-listeners.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/provision-byoip-cidr.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/update-accelerator-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/update-accelerator.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/update-endpoint-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/update-listener.rst
+#usr/lib/python3.8/site-packages/awscli/examples/globalaccelerator/withdraw-byoip-cidr.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue
+#usr/lib/python3.8/site-packages/awscli/examples/glue/batch-stop-job-run.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/create-connection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/create-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/create-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/create-table.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/delete-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/get-databases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/get-job-run.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/get-job-runs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/get-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/get-plan.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/get-tables.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/start-crawler.rst
+#usr/lib/python3.8/site-packages/awscli/examples/glue/start-job-run.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/associate-role-to-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/associate-service-role-to-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-connector-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-connector-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-core-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-core-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-device-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-device-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-function-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-function-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-group-certificate-authority.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-group-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-logger-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-logger-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-resource-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-resource-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-software-update-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-subscription-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/create-subscription-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-connector-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-core-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-device-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-function-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-logger-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-resource-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/delete-subscription-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/disassociate-role-from-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/disassociate-service-role-from-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-associated-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-bulk-deployment-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-connectivity-info.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-connector-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-connector-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-core-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-core-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-deployment-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-device-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-device-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-function-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-function-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-group-certificate-authority.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-group-certificate-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-group-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-logger-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-logger-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-resource-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-resource-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-service-role-for-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-subscription-definition-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/get-subscription-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-bulk-deployment-detailed-reports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-bulk-deployments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-connector-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-connector-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-core-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-core-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-deployments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-device-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-device-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-function-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-function-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-group-certificate-authorities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-group-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-logger-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-logger-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-resource-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-resource-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-subscription-definition-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-subscription-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/reset-deployments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/start-bulk-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/stop-bulk-deployment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-connectivity-info.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-connector-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-core-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-device-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-function-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-group-certificate-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-logger-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-resource-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/greengrass/update-subscription-definition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/accept-invitation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/archive-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-publishing-destination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-sample-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/create-threat-intel-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/decline-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/delete-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/delete-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/disable-organization-admin-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/disassociate-from-master-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/get-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/get-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/get-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/get-master-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/list-detectors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/list-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/list-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/list-ip-sets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/list-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/guardduty/update-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/health
+#usr/lib/python3.8/site-packages/awscli/examples/health/describe-affected-entities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/health/describe-event-details.rst
+#usr/lib/python3.8/site-packages/awscli/examples/health/describe-events.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam
 #usr/lib/python3.8/site-packages/awscli/examples/iam/add-client-id-to-open-id-connect-provider.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/add-role-to-instance-profile.rst
@@ -1148,9 +2518,12 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/iam/create-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/create-role.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/create-saml-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/create-service-linked-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/create-service-specific-credential.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/create-user.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/create-virtual-mfa-device.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/deactivate-mfa-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/decode-authorization-message.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-access-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-account-alias.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-account-password-policy.rst
@@ -1161,10 +2534,16 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-open-id-connect-provider.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-policy-version.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/delete-role-permissions-boundary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-role-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-role.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-saml-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/delete-server-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/delete-service-linked-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/delete-service-specific-credential.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-signing-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/delete-ssh-public-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/delete-user-permissions-boundary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-user-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-user.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/delete-virtual-mfa-device.rst
@@ -1173,21 +2552,31 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/iam/detach-user-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/enable-mfa-device.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/generate-credential-report.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/generate-organizations-access-report.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/generate-service-last-accessed-details.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-access-key-last-used.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-account-authorization-details.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-account-password-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-account-summary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-context-keys-for-custom-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-context-keys-for-principal-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-credential-report.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-group-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-instance-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-login-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-open-id-connect-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-organizations-access-report.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-policy-version.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-role-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-role.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-saml-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-server-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-service-last-accessed-details-with-entities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-service-last-accessed-details.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-service-linked-role-deletion-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/get-ssh-public-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-user-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/get-user.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-access-keys.rst
@@ -1203,34 +2592,101 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-instance-profiles.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-mfa-devices.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-open-id-connect-providers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-policies-granting-service-access.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-policies.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-policy-versions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-role-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-role-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-roles.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-saml-providers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-server-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-service-specific-credential.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-service-specific-credentials.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-signing-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-ssh-public-keys.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-user-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/list-user-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-users.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/list-virtual-mfa-devices.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/put-group-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/put-role-permissions-boundary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/put-role-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/put-user-permissions-boundary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/put-user-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/remove-client-id-from-open-id-connect-provider.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/remove-role-from-instance-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/remove-user-from-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/reset-service-specific-credential.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/resync-mfa-device.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/set-default-policy-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/set-security-token-service-preferences.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/simulate-custom-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/simulate-principal-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/tag-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/tag-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/untag-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/untag-user.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-access-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-account-password-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-assume-role-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-login-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-open-id-connect-provider-thumbprint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/update-role-description.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/update-role.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-saml-provider.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/update-server-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/update-service-specific-credential.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-signing-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/update-ssh-public-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/update-user.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/upload-server-certificate.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iam/upload-signing-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/upload-ssh-public-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/wait
+#usr/lib/python3.8/site-packages/awscli/examples/iam/wait/instance-profile-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/wait/policy-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/wait/role-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iam/wait/user-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/create-component.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/create-distribution-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/create-image-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/create-image-recipe.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/create-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/create-infrastructure-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/delete-component.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/delete-image-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/delete-image-recipe.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/delete-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/delete-infrastructure-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-component-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-component.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-distribution-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-image-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-image-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-image-recipe-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/get-infrastructure-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/import-component.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-component-build-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-components.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-distribution-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-image-build-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-image-pipeline-images.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-image-recipes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-images.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-infrastructure-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/put-component-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/put-image-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/put-image-recipe-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/start-image-pipeline-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/update-distribution-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/update-image-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/imagebuilder/update-infrastructure-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/importexport
 #usr/lib/python3.8/site-packages/awscli/examples/importexport/cancel-job.rst
 #usr/lib/python3.8/site-packages/awscli/examples/importexport/create-job.rst
@@ -1272,11 +2728,676 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/inspector/unsubscribe-from-event.rst
 #usr/lib/python3.8/site-packages/awscli/examples/inspector/update-assessment-target.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iot
+#usr/lib/python3.8/site-packages/awscli/examples/iot-data
+#usr/lib/python3.8/site-packages/awscli/examples/iot-data/delete-thing-shadow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot-data/get-thing-shadow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot-data/update-thing-shadow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot-jobs-data
+#usr/lib/python3.8/site-packages/awscli/examples/iot-jobs-data/describe-job-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot-jobs-data/get-pending-job-executions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot-jobs-data/start-next-pending-job-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot-jobs-data/update-job-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/accept-certificate-transfer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/add-thing-to-billing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/add-thing-to-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/associate-targets-with-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/attach-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/attach-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/attach-thing-principal.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/cancel-audit-mitigation-actions-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/cancel-audit-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/cancel-certificate-transfer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/cancel-job-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/cancel-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/clear-default-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/confirm-topic-rule-destination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-audit-suppression.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-billing-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/iot/create-certificate-from-csr.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-dimension.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-domain-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-dynamic-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-keys-and-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-mitigation-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-ota-update.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-policy-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-provisioning-claim.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-provisioning-template-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-provisioning-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-role-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-scheduled-audit.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-thing-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-topic-rule-destination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/create-topic-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-account-audit-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-audit-suppression.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-billing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-ca-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-dimension.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-domain-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-dynamic-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-job-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-mitigation-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-ota-update.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-policy-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-provisioning-template-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-provisioning-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-registration-code.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-role-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-scheduled-audit.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-thing-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-topic-rule-destination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-topic-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/delete-v2-logging-level.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/deprecate-thing-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-account-audit-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-audit-finding.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-audit-mitigation-actions-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-audit-suppression.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-audit-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-billing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-ca-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-default-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-dimension.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-domain-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-event-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-index.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-job-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-mitigation-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-provisioning-template-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-provisioning-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-role-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-scheduled-audit.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-thing-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/describe-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/detach-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/detach-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/detach-thing-principal.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/disable-topic-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/enable-topic-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-cardinality.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-effective-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-indexing-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-job-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-ota-update.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-percentiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-policy-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-registration-code.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-statistics.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-topic-rule-destination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-topic-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/get-v2-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-active-violations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-attached-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-audit-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-audit-mitigation-actions-executions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-audit-mitigation-actions-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-audit-suppressions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-audit-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-authorizers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-billing-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-ca-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-certificates-by-ca.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-dimensions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-domain-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-indices.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-job-executions-for-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-job-executions-for-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-mitigations-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-ota-updates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-outgoing-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-policy-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-principal-things.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-provisioning-template-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-provisioning-templates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-role-aliases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-scheduled-audits.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-security-profiles-for-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-security-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-streams.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-targets-for-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-targets-for-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-thing-groups-for-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-thing-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-thing-principals.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-thing-types.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-things-in-billing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-things-in-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-things.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-topic-rule-destinations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-topic-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-v2-logging-levels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/list-violation-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/register-ca-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/register-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/register-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/reject-certificate-transfer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/remove-thing-from-billing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/remove-thing-from-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/replace-topic-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/search-index.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/set-default-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/set-default-policy-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/set-v2-logging-level.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/set-v2-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/start-audit-mitigation-actions-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/start-on-demand-audit-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/test-authorization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/test-invoke-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/transfer-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-account-audit-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-audit-suppression.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-authorizer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-billing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-ca-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-domain-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-dynamic-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-event-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-indexing-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-mitigation-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-provisioning-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-role-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-scheduled-audit.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-security-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-thing-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-thing-groups-for-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/update-topic-rule-destination.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot/validate-security-profile-behaviors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/claim-devices-by-claim-code.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/describe-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/finalize-device-claim.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/get-device-methods.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/initiate-device-claim.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/invoke-device-method.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/list-device-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/list-devices.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/unclaim-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-devices/update-device-state.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/associate-device-with-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/create-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/create-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/delete-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/delete-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/describe-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/describe-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/disassociate-device-from-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/get-devices-in-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/list-placements.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/list-projects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/update-placement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iot1click-projects/update-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/batch-put-message.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/cancel-pipeline-reprocessing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/create-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/create-dataset-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/create-dataset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/create-datastore.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/create-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/delete-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/delete-dataset-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/delete-dataset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/delete-datastore.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/delete-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/describe-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/describe-dataset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/describe-datastore.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/describe-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/describe-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/get-dataset-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/list-channels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/list-dataset-contents.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/list-datasets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/list-datastores.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/list-pipelines.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/put-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/run-pipeline-activity.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/sample-channel-data.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/start-pipeline-reprocessing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/update-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/update-dataset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/update-datastore.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotanalytics/update-pipeline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/batch-put-message.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/batch-update-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/create-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/create-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/delete-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/delete-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/describe-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/describe-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/describe-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/describe-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/list-detector-model-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/list-detector-models.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/list-detectors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/list-inputs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/put-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/update-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents-data/update-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/batch-put-message.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/batch-update-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/create-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/create-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/delete-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/delete-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/describe-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/describe-detector.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/describe-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/describe-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/list-detector-model-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/list-detector-models.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/list-detectors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/list-inputs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/put-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/update-detector-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotevents/update-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/associate-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/batch-associate-project-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/batch-disassociate-project-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/batch-put-asset-property-value.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-access-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-asset-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-dashboard.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-portal.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/create-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-access-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-asset-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-dashboard.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-portal.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/delete-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-access-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-asset-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-asset-property.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-dashboard.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-gateway-capability-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-portal.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/describe-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/disassociate-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/get-asset-property-aggregates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/get-asset-property-value-history.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/get-asset-property-value.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-access-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-asset-models.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-associated-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-dashboards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-gateways.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-portals.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-project-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-projects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/put-logging-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-access-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-asset-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-asset-property.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-dashboard.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-gateway-capability-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-portal.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/update-project.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait/asset-active.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait/asset-model-active.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait/asset-model-not-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait/asset-not-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait/portal-active.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotsitewise/wait/portal-not-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/associate-entity-to-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/create-flow-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/create-system-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/create-system-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/delete-flow-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/delete-namespace.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/delete-system-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/delete-system-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/deploy-system-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/deprecate-flow-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/deprecate-system-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/describe-namespace.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/dissociate-entity-from-thing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-entities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-flow-template-revisions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-flow-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-namespace-deletion-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-system-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-system-template-revisions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-system-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/get-upload-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/list-flow-execution-messages.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/search-entities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/search-flow-executions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/search-flow-templates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/search-system-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/search-system-templates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/search-things.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/undeploy-system-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/update-flow-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/update-system-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/iotthingsgraph/upload-entity-definitions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/batch-get-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/batch-get-stream-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/create-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/create-stream-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/delete-playback-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/delete-stream-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/get-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/get-playback-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/get-stream-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/get-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/import-playback-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/list-channels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/list-playback-key-pairs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/list-stream-keys.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/list-streams.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/put-metadata.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/stop-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ivs/update-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/create-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/create-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/describe-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/get-bootstrap-brokers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/list-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/update-broker-storage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kafka/update-cluster-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/add-tags-to-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/create-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/decrease-stream-retention-period.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/delete-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/deregister-stream-consumer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/describe-limits.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/describe-stream-consumer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/describe-stream-summary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/describe-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/disable-enhanced-monitoring.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/enable-enhanced-monitoring.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/get-records.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/get-shard-iterator.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/increase-stream-retention-period.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/list-shards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/list-streams.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/list-tags-for-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/merge-shards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/put-record.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/put-records.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/register-stream-consumer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/remove-tags-from-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/split-shard.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/start-stream-encryption.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/stop-stream-encryption.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kinesis/update-shard-count.rst
 #usr/lib/python3.8/site-packages/awscli/examples/kms
+#usr/lib/python3.8/site-packages/awscli/examples/kms/cancel-key-deletion.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/connect-custom-key-store.rst
 #usr/lib/python3.8/site-packages/awscli/examples/kms/create-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/create-custom-key-store.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/create-grant.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/create-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/kms/decrypt.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/delete-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/delete-custom-key-store.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/delete-imported-key-material.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/describe-custom-key-stores.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/describe-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/disable-key-rotation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/disable-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/disconnect-custom-key-store.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/enable-key-rotation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/enable-key.rst
 #usr/lib/python3.8/site-packages/awscli/examples/kms/encrypt.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/generate-random.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/get-key-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/get-key-rotation-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/get-parameters-for-import.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/get-public-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/import-key-material.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/list-aliases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/list-grants.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/list-key-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/list-keys.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/list-resource-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/list-retirable-grants.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/put-key-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/re-encrypt.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/retire-grant.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/revoke-grant.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/schedule-key-deletion.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/sign.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/update-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/update-custom-key-store.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/update-key-description.rst
+#usr/lib/python3.8/site-packages/awscli/examples/kms/verify.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/add-layer-version-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/add-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/create-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/create-event-source-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/create-function.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-event-source-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-function-concurrency.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-function-event-invoke-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-function.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-layer-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/delete-provisioned-concurrency-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-account-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-event-source-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-function-concurrency.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-function-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-function-event-invoke-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-function.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-layer-version-by-arn.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-layer-version-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-layer-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/get-provisioned-concurrency-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/invoke.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-aliases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-event-source-mappings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-function-event-invoke-configs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-functions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-layer-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-layers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-provisioned-concurrency-configs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/list-versions-by-function.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/publish-layer-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/publish-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/put-function-concurrency.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/put-function-event-invoke-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/put-provisioned-concurrency-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/remove-layer-version-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/remove-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/update-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/update-event-source-mapping.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/update-function-code.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/update-function-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lambda/update-function-event-invoke-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/create-license-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/delete-license-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/get-license-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/get-service-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/list-associations-for-license-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/list-license-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/list-license-specifications-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/list-resource-inventory.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/list-usage-for-license-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/update-license-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/update-license-specifications-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/license-manager/update-service-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/allocate-static-ip.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/attach-disk.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/attach-instances-to-load-balancer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/attach-load-balancer-tls-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/attach-static-ip.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/close-instance-public-ports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/copy-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-disk-from-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-disk-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-disk.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-domain-entry.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-instance-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-instances-from-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-load-balancer-tls-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-load-balancer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-relational-database-from-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-relational-database-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/create-relational-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-auto-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-disk-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-disk.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-domain-entry.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-instance-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-known-host-keys.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-load-balancer-tls-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-load-balancer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-relational-database-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/delete-relational-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/detach-static-ip.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-active-names.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-auto-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-blueprints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-bundles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-cloud-formation-stack-records.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-disk-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-disk-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-disk.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-disks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-domains.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-export-snapshot-record.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance-access-details.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance-metric-data.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance-port-states.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance-state.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-key-pair.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-key-pairs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-load-balancer-tls-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-load-balancer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-load-balancers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-operation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-operations-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-operations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-regions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-blueprints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-bundles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-log-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-log-streams.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-master-user-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-metric-data.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-relational-databases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-static-ip.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/get-static-ips.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/is-vpc-peered.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/open-instance-public-ports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/peer-vpc.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/reboot-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/reboot-relational-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/release-static-ip.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/start-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/start-relational-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/stop-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/stop-relational-database.rst
+#usr/lib/python3.8/site-packages/awscli/examples/lightsail/unpeer-vpc.rst
 #usr/lib/python3.8/site-packages/awscli/examples/logs
 #usr/lib/python3.8/site-packages/awscli/examples/logs/create-log-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/logs/create-log-stream.rst
@@ -1288,6 +3409,152 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/logs/get-log-events.rst
 #usr/lib/python3.8/site-packages/awscli/examples/logs/put-log-events.rst
 #usr/lib/python3.8/site-packages/awscli/examples/logs/put-retention-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/add-flow-outputs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/create-flow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/delete-flow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/describe-flow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/grant-flow-entitlements.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/list-entitlements.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/list-flows.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/remove-flow-output.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/revoke-flow-entitlement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/start-flow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/stop-flow.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/update-flow-entitlement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/update-flow-output.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconnect/update-flow-source.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/cancel-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/create-job-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/create-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/create-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/create-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/delete-job-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/delete-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/delete-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/describe-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/get-job-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/get-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/get-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/get-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/list-job-templates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/list-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/list-presets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/list-queues.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/update-job-template.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/update-preset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediaconvert/update-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/medialive
+#usr/lib/python3.8/site-packages/awscli/examples/medialive/create-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/medialive/create-input.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/create-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/create-packaging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/create-packaging-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/delete-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/delete-packaging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/delete-packaging-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/describe-asset.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/describe-packaging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/describe-packaging-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/list-assets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/list-packaging-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage-vod/list-packaging-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/create-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/create-origin-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/delete-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/delete-origin-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/describe-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/describe-origin-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/list-channels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/list-origin-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/rotate-ingest-endpoint-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/update-channel.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediapackage/update-origin-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore-data
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore-data/delete-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore-data/describe-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore-data/get-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore-data/list-items.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore-data/put-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/create-container.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/delete-container-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/delete-container.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/delete-cors-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/delete-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/describe-container.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/describe-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/get-container-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/get-cors-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/get-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/get-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/list-containers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/list-items.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/put-container-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/put-cors-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/put-lifecycle-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/put-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/start-access-logging.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/stop-access-logging.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediastore/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediatailor
+#usr/lib/python3.8/site-packages/awscli/examples/mediatailor/delete-playback-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediatailor/get-playback-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediatailor/list-playback-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/mediatailor/put-playback-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/associate-customer-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/associate-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/create-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/create-global-network.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/create-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/create-site.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-bucket-analytics-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-bucket-metrics-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-global-network.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/delete-site.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/deregister-transit-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/describe-global-networks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/disassociate-customer-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/disassociate-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-bucket-analytics-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-bucket-metrics-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-customer-gateway-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-devices.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-link-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-links.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-object-retention.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-sites.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/get-transit-gateway-registrations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/list-bucket-analytics-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/list-bucket-metrics-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/put-bucket-metrics-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/put-object-retention.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/put-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/register-transit-gateway.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/update-device.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/update-global-network.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/update-link.rst
+#usr/lib/python3.8/site-packages/awscli/examples/networkmanager/update-site.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/assign-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/assign-volume.rst
@@ -1297,6 +3564,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/create-deployment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/create-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/create-layer.rst
+#usr/lib/python3.8/site-packages/awscli/examples/opsworks/create-server.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/create-stack.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/create-user-profile.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/delete-app.rst
@@ -1320,6 +3588,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-permissions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-raid-arrays.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-rds-db-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-stack-provisioning-parameters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-stack-summary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-stacks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/opsworks/describe-timebased-auto-scaling.rst
@@ -1408,49 +3677,347 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/pi
 #usr/lib/python3.8/site-packages/awscli/examples/pi/describe-dimension-keys.rst
 #usr/lib/python3.8/site-packages/awscli/examples/pi/get-resource-metrics.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint/create-app.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint/delete-app.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint/get-apps.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pinpoint/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly
+#usr/lib/python3.8/site-packages/awscli/examples/polly/delete-lexicon.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly/get-lexicon.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly/get-speech-synthesis-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly/list-lexicons.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly/list-speech-synthesis-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly/put-lexicon.rst
+#usr/lib/python3.8/site-packages/awscli/examples/polly/start-speech-synthesis-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pricing
+#usr/lib/python3.8/site-packages/awscli/examples/pricing/describe-services.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pricing/get-attribute-values.rst
+#usr/lib/python3.8/site-packages/awscli/examples/pricing/get-products.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/cancel-journal-kinesis-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/create-ledger.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/delete-ledger.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/describe-journal-kinesis-stream.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/describe-journal-s3-export.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/describe-ledger.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/export-journal-to-s3.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/get-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/get-digest.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/get-revision.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/list-journal-kinesis-streams-for-ledger.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/list-journal-s3-exports-for-ledger.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/list-journal-s3-exports.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/list-ledgers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/stream-journal-to-kinesis.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/qldb/update-ledger.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram
+#usr/lib/python3.8/site-packages/awscli/examples/ram/accept-resource-share-invitation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/associate-resource-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/create-resource-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/delete-resource-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/disassociate-resource-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/enable-sharing-with-aws-organization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/get-resource-policies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/get-resource-share-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/get-resource-share-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/get-resource-shares.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/list-principals.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/list-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/reject-resource-share-invitation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ram/update-resource-share.rst
 #usr/lib/python3.8/site-packages/awscli/examples/rds
-#usr/lib/python3.8/site-packages/awscli/examples/rds/add-tag-to-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds-data
+#usr/lib/python3.8/site-packages/awscli/examples/rds-data/batch-execute-statement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds-data/begin-transaction.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds-data/commit-transaction.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds-data/execute-statement.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds-data/rollback-transaction.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/add-option-to-option-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/add-role-to-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/add-source-identifier-to-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/add-tags-to-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/authorize-db-security-group-ingress.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/backtrack-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/copy-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/copy-db-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/copy-db-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/copy-db-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/copy-option-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-cluster-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-instance-read-replica.rst
 #usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-parameter-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-security-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-db-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/create-global-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/rds/create-option-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-cluster-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-security-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-db-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-global-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/delete-option-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-account-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-cluster-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-cluster-parameter-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-cluster-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-cluster-snapshot-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-cluster-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-engine-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-instance-automated-backups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-log-files.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-parameter-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-security-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-snapshot-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-db-subnet-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-engine-default-cluster-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-engine-default-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-event-categories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-event-subscriptions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-export-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-global-clusters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-option-group-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-option-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-orderable-db-instance-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-pending-maintenance-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-reserved-db-instances-offerings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-reserved-db-instances.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-source-regions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/describe-valid-db-instance-modifications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/rds/download-db-log-file-portion.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/generate-auth-token.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-cluster-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-cluster-snapshot-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-snapshot-attribute.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-snapshot-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-db-subnet-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/modify-global-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/promote-read-replica.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/purchase-reserved-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/purchase-reserved-db-instances-offerings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/reboot-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/remove-option-from-option-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/remove-role-from-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/remove-source-identifier-from-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/restore-db-cluster-from-s3.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/restore-db-cluster-from-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/restore-db-cluster-to-point-in-time.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/restore-db-instance-from-db-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/restore-db-instance-from-s3.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/restore-db-instance-to-point-in-time.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/start-db-instance.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/start-export-task.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/stop-db-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rds/stop-db-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/accept-reserved-node-exchange.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/authorize-cluster-security-group-ingress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/authorize-snapshot-access.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/batch-delete-cluster-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/batch-modify-cluster-snapshots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/cancel-resize.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/copy-cluster-snapshot.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/create-cluster-parameter-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/create-cluster-security-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/create-cluster-snapshot.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/create-cluster-subnet-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/create-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/create-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/create-hsm-client-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/create-hsm-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/create-snapshot-copy-grant.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/create-snapshot-schedule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/create-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-cluster-parameter-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-cluster-security-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-cluster-snapshot.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-cluster-subnet-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-hsm-client-certificate.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-hsm-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-scheduled-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-snapshot-copy-grant.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-snapshot-schedule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/delete-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-account-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-db-revisions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-parameter-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-parameters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-security-groups.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-snapshots.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-subnet-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-tracks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-cluster-versions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-clusters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-default-cluster-parameters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-event-categories.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-event-subscriptions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-events.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-hsm-client-certificates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-hsm-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-logging-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-node-configuration-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-orderable-cluster-options.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-reserved-node-offerings.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-reserved-nodes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-resize.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-scheduled-actions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-snapshot-copy-grants.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-snapshot-schedules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-storage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-table-restore-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/describe-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/disable-snapshot-copy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/enable-snapshot-copy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/get-cluster-credentials.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/get-reserved-node-exchange-offerings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster-iam-roles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster-maintenance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster-snapshot-schedule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster-snapshot.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster-subnet-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-cluster.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-event-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-scheduled-action.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-snapshot-copy-retention-period.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/modify-snapshot-schedule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/purchase-reserved-node-offering.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/reboot-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/reset-cluster-parameter-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/resize-cluster.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/restore-from-cluster-snapshot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/restore-table-from-cluster-snapshot.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/revoke-cluster-security-group-ingress.rst
 #usr/lib/python3.8/site-packages/awscli/examples/redshift/revoke-snapshot-access.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/rotate-encryption-key.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/wait
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/wait/cluster-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/wait/cluster-deleted.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/wait/cluster-restored.rst
+#usr/lib/python3.8/site-packages/awscli/examples/redshift/wait/snapshot-available.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/compare-faces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/create-collection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/create-stream-processor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/delete-collection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/delete-faces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/delete-stream-processor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/describe-collection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/describe-stream-processor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/detect-faces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/detect-labels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/detect-moderation-labels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/detect-text.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-celebrity-info.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-celebrity-recognition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-content-moderation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-face-detection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-face-search.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-label-detection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/get-person-tracking.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/index-faces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/list-collections.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/list-faces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/list-stream-processors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/recognize-celebrities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/search-faces-by-image.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/search-faces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-celebrity-recognition.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-content-moderation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-face-detection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-face-search.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-label-detection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-person-tracking.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/start-stream-processor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/rekognition/stop-stream-processor.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/create-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/delete-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/get-group-query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/get-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/get-tags.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/list-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/list-resource-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/search-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/tag.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/untag.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/update-group-query.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resource-groups/update-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resourcegroupstaggingapi
+#usr/lib/python3.8/site-packages/awscli/examples/resourcegroupstaggingapi/get-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resourcegroupstaggingapi/get-tag-keys.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resourcegroupstaggingapi/get-tag-values.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resourcegroupstaggingapi/tag-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/resourcegroupstaggingapi/untag-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/batch-describe-simulation-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/cancel-simulation-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-deployment-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-fleet.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-robot-application-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-robot-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-robot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-simulation-application-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-simulation-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/create-simulation-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/delete-fleet.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/delete-robot-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/delete-robot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/delete-simulation-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/deregister-robot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/describe-deployment-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/describe-fleet.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/describe-robot-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/describe-robot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/describe-simulation-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/describe-simulation-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-deployment-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-fleets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-robot-applications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-robots.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-simulation-applications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-simulation-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/register-robot.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/restart-simulation-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/sync-deployment-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/update-robot-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/robomaker/update-simulation-application.rst
 #usr/lib/python3.8/site-packages/awscli/examples/route53
 #usr/lib/python3.8/site-packages/awscli/examples/route53/change-resource-record-sets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/route53/change-tags-for-resource.rst
@@ -1464,13 +4031,62 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/route53/list-health-checks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/route53/list-hosted-zones-by-name.rst
 #usr/lib/python3.8/site-packages/awscli/examples/route53/list-hosted-zones.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53/list-query-logging-configs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/route53/list-resource-record-sets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/check-domain-availability.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/check-domain-transferability.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/delete-tags-for-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/disable-domain-auto-renew.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/disable-domain-transfer-lock.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/enable-domain-auto-renew.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/enable-domain-transfer-lock.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/get-contact-reachability-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/get-domain-detail.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/get-domain-suggestions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/get-operation-detail.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/list-domains.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/list-operations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/list-tags-for-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/register-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/renew-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/resend-contact-reachability-email.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/retrieve-domain-auth-code.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/transfer-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/update-domain-contact-privacy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/update-domain-contact.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/update-domain-nameservers.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/update-tags-for-domain.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53domains/view-billing.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/associate-resolver-endpoint-ip-address.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/associate-resolver-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/create-resolver-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/create-resolver-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/delete-resolver-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/delete-resolver-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/disassociate-resolver-endpoint-ip-address.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/disassociate-resolver-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/get-resolver-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/get-resolver-rule-association.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/get-resolver-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/list-resolver-endpoint-ip-addresses.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/list-resolver-endpoints.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/list-resolver-rule-associations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/list-resolver-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/put-resolver-rule-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/update-resolver-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/route53resolver/update-resolver-rule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3
 #usr/lib/python3.8/site-packages/awscli/examples/s3/_concepts.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/cp.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/ls.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/mb.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/mv.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3/presign.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/rb.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/rm.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3/sync.rst
@@ -1481,52 +4097,111 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/copy-object.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/create-bucket.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/create-multipart-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-analytics-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-cors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-encryption.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-inventory-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-lifecycle.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-metrics-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-replication.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-tagging.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket-website.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-bucket.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-object-tagging.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-object.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-objects.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/delete-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-accelerate-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-analytics-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-cors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-encryption.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-inventory-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-lifecycle-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-lifecycle.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-location.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-logging.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-metrics-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-notification-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-notification.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-policy-status.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-replication.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-request-payment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-tagging.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-versioning.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-bucket-website.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object-legal-hold.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object-lock-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object-retention.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object-tagging.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object-torrent.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/get-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/get-public-access-block.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/head-bucket.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/head-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/list-bucket-analytics-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/list-bucket-inventory-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/list-bucket-metrics-configurations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/list-buckets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/list-multipart-uploads.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/list-object-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/list-objects-v2.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/list-objects.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/list-parts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-accelerate-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-analytics-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-cors.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-encryption.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-inventory-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-lifecycle-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-lifecycle.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-logging.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-metrics-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-notification-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-notification.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-policy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-replication.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-request-payment.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-tagging.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-versioning.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-bucket-website.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-object-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-object-legal-hold.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-object-lock-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-object-retention.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-object-tagging.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/put-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/put-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/restore-object.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/select-object-content.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/upload-part-copy.rst
 #usr/lib/python3.8/site-packages/awscli/examples/s3api/upload-part.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/wait
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/wait/bucket-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/wait/bucket-not-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/wait/object-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3api/wait/object-not-exists.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/create-access-point.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/create-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/delete-access-point-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/delete-access-point.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/delete-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/describe-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/get-access-point-policy-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/get-access-point-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/get-access-point.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/get-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/list-access-points.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/list-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/put-access-point-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/put-public-access-block.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/update-job-priority.rst
+#usr/lib/python3.8/site-packages/awscli/examples/s3control/update-job-status.rst
 #usr/lib/python3.8/site-packages/awscli/examples/secretsmanager
 #usr/lib/python3.8/site-packages/awscli/examples/secretsmanager/cancel-rotate-secret.rst
 #usr/lib/python3.8/site-packages/awscli/examples/secretsmanager/create-secret.rst
@@ -1546,6 +4221,103 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/secretsmanager/untag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/secretsmanager/update-secret-version-stage.rst
 #usr/lib/python3.8/site-packages/awscli/examples/secretsmanager/update-secret.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/accept-invitation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/batch-disable-standards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/batch-enable-standards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/batch-import-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/batch-update-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/create-action-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/create-insight.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/create-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/decline-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/delete-action-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/delete-insight.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/delete-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/delete-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/describe-action-targets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/describe-hub.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/describe-products.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/describe-standards-controls.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/describe-standards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/disable-import-findings-for-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/disable-security-hub.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/disassociate-from-master-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/disassociate-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/enable-import-findings-for-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/enable-security-hub.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-enabled-standards.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-findings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-insight-results.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-insights.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-invitations-count.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-master-account.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/get-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/invite-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/list-enabled-products-for-import.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/list-invitations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/list-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/update-action-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/update-insight.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/update-security-hub-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/securityhub/update-standards-control.rst
+#usr/lib/python3.8/site-packages/awscli/examples/serverlessrepo
+#usr/lib/python3.8/site-packages/awscli/examples/serverlessrepo/put-application-policy.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/get-aws-default-service-quota.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/get-requested-service-quota-change.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/get-service-quota.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/list-aws-default-service-quotas.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/list-requested-service-quota-change-history-by-quota.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/list-requested-service-quota-change-history.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/list-service-quotas.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/list-services.rst
+#usr/lib/python3.8/site-packages/awscli/examples/service-quotas/request-service-quota-increase.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/accept-portfolio-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/associate-principal-with-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/associate-product-with-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/associate-tag-option-with-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/copy-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/create-portfolio-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/create-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/create-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/create-provisioning-artifact.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/create-tag-option.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/delete-portfolio-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/delete-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/delete-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/delete-provisioning-artifact.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/delete-tag-option.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/describe-copy-product-status.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/describe-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/describe-product-as-admin.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/describe-provisioned-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/describe-provisioning-artifact.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/describe-tag-option.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/disassociate-principal-from-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/disassociate-product-from-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/disassociate-tag-option-from-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-accepted-portfolio-shares.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-portfolio-access.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-portfolios-for-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-portfolios.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-principals-for-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-provisioning-artifacts.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-resources-for-tag-option.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/list-tag-options.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/provision-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/reject-portfolio-share.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/scan-provisioned-products.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/search-products-as-admin.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/search-provisioned-products.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/update-portfolio.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/update-product.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/update-provisioning-artifact.rst
+#usr/lib/python3.8/site-packages/awscli/examples/servicecatalog/update-tag-option.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ses
 #usr/lib/python3.8/site-packages/awscli/examples/ses/delete-identity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ses/get-identity-dkim-attributes.rst
@@ -1562,19 +4334,71 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ses/verify-domain-dkim.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ses/verify-domain-identity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ses/verify-email-identity.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield
+#usr/lib/python3.8/site-packages/awscli/examples/shield/associate-drt-log-bucket.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/associate-drt-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/create-protection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/create-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/delete-protection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/describe-attack.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/describe-drt-access.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/describe-emergency-contact-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/describe-protection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/describe-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/disassociate-drt-log-bucket.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/disassociate-drt-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/get-subscription-state.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/list-attacks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/list-protections.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/update-emergency-contact-settings.rst
+#usr/lib/python3.8/site-packages/awscli/examples/shield/update-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer
+#usr/lib/python3.8/site-packages/awscli/examples/signer/cancel-signing-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/describe-signing-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/get-signing-platform.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/get-signing-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/list-signing-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/list-signing-platforms.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/list-signing-profiles.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/put-signing-profile.rst
+#usr/lib/python3.8/site-packages/awscli/examples/signer/start-signing-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/snowball
+#usr/lib/python3.8/site-packages/awscli/examples/snowball/get-snowball-usage.rst
+#usr/lib/python3.8/site-packages/awscli/examples/snowball/list-jobs.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns
+#usr/lib/python3.8/site-packages/awscli/examples/sns/add-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/check-if-phone-number-is-opted-out.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/confirm-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/create-platform-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/create-platform-endpoint.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/create-topic.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/delete-endpoint.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/delete-platform-application.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/delete-topic.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/get-endpoint-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/get-platform-application-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/get-sms-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/get-subscription-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/get-topic-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/list-endpoints-by-platform-application.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/list-phone-numbers-opted-out.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/list-platform-applications.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/list-subscriptions-by-topic.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/list-subscriptions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/list-tags-for-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/list-topics.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/opt-in-phone-number.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/publish.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/remove-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/set-endpoint-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/set-platform-application-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/set-sms-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/set-subscription-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/set-topic-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/subscribe.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/tag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sns/unsubscribe.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sns/untag-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/add-permission.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/change-message-visibility-batch.rst
@@ -1586,6 +4410,7 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/get-queue-attributes.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/get-queue-url.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/list-dead-letter-source-queues.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sqs/list-queue-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/list-queues.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/purge-queue.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/receive-message.rst
@@ -1593,28 +4418,39 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/send-message-batch.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/send-message.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sqs/set-queue-attributes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sqs/tag-queue.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sqs/untag-queue.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/add-tags-to-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/cancel-command.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/cancel-maintenance-window-execution.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/create-activation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/create-association-batch.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/create-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/create-document.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/create-maintenance-window.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/create-ops-item.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/create-patch-baseline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/create-resource-data-sync.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-activation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-inventory.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-maintenance-window.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-parameter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-parameters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-patch-baseline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/delete-resource-data-sync.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/deregister-managed-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/deregister-patch-baseline-for-patch-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/deregister-target-from-maintenance-window.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/deregister-task-from-maintenance-window.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-activations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-association-execution-targets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-association-executions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-automation-executions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-automation-step-executions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-available-patches.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-document-permission.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-document.rst
@@ -1625,38 +4461,60 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-instance-patch-states-for-patch-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-instance-patch-states.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-instance-patches.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-inventory-deletions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-window-execution-task-invocations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-window-execution-tasks.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-window-executions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-window-schedule.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-window-targets.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-window-tasks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-windows-for-target.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-maintenance-windows.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-ops-items.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-parameters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-patch-baselines.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-patch-group-state.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-patch-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-patch-properties.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/describe-sessions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-automation-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-calendar-state.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-command-invocation.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-connection-status.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-default-patch-baseline.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-deployable-patch-snapshot-for-instance.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-document.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-inventory-schema.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-inventory.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-maintenance-window-execution-task-invocation.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-maintenance-window-execution-task.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-maintenance-window-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-maintenance-window-task.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-maintenance-window.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-ops-item.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-ops-summary.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-parameter-history.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-parameter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-parameters-by-path.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-parameters.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-patch-baseline-for-patch-group.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/get-patch-baseline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/get-service-setting.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/label-parameter-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/list-association-versions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-associations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-command-invocations.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-commands.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/list-compliance-items.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/list-compliance-summaries.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-document-versions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-documents.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-inventory-entries.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/list-resource-compliance-summaries.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/list-resource-data-sync.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/list-tags-for-resource.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/modify-document-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/put-compliance-items.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/put-inventory.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/put-parameter.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/register-default-patch-baseline.rst
@@ -1664,22 +4522,54 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/register-target-with-maintenance-window.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/register-task-with-maintenance-window.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/remove-tags-from-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/reset-service-setting.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/resume-session.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/send-automation-signal.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/send-command.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/start-associations-once.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/start-automation-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/start-session.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/stop-automation-execution.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/terminate-session.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-association-status.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-association.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-document-default-version.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/update-maintenance-window-target.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/update-maintenance-window-task.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-maintenance-window.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-managed-instance-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/update-ops-item.rst
 #usr/lib/python3.8/site-packages/awscli/examples/ssm/update-patch-baseline.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/update-resource-data-sync.rst
+#usr/lib/python3.8/site-packages/awscli/examples/ssm/update-service-setting.rst
 #usr/lib/python3.8/site-packages/awscli/examples/storagegateway
 #usr/lib/python3.8/site-packages/awscli/examples/storagegateway/describe-gateway-information.rst
+#usr/lib/python3.8/site-packages/awscli/examples/storagegateway/list-file-shares.rst
 #usr/lib/python3.8/site-packages/awscli/examples/storagegateway/list-gateways.rst
 #usr/lib/python3.8/site-packages/awscli/examples/storagegateway/list-volumes.rst
+#usr/lib/python3.8/site-packages/awscli/examples/storagegateway/refresh-cache.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sts
+#usr/lib/python3.8/site-packages/awscli/examples/sts/assume-role-with-saml.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sts/assume-role-with-web-identity.rst
 #usr/lib/python3.8/site-packages/awscli/examples/sts/assume-role.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sts/get-caller-identity.rst
+#usr/lib/python3.8/site-packages/awscli/examples/sts/get-session-token.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support
+#usr/lib/python3.8/site-packages/awscli/examples/support/add-attachments-to-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/add-communication-to-case.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/create-case.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-attachment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-cases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-communications.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-services.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-severity-levels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-trusted-advisor-check-refresh-statuses.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-trusted-advisor-check-result.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-trusted-advisor-check-summaries.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/describe-trusted-advisor-checks.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/refresh-trusted-advisor-check.rst
+#usr/lib/python3.8/site-packages/awscli/examples/support/resolve-case.rst
 #usr/lib/python3.8/site-packages/awscli/examples/swf
 #usr/lib/python3.8/site-packages/awscli/examples/swf/count-closed-workflow-executions.rst
 #usr/lib/python3.8/site-packages/awscli/examples/swf/count-open-workflow-executions.rst
@@ -1690,7 +4580,55 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/swf/list-workflow-types.rst
 #usr/lib/python3.8/site-packages/awscli/examples/swf/register-domain.rst
 #usr/lib/python3.8/site-packages/awscli/examples/swf/register-workflow-type.rst
+#usr/lib/python3.8/site-packages/awscli/examples/textract
+#usr/lib/python3.8/site-packages/awscli/examples/textract/analyze-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/textract/detect-document-text.rst
+#usr/lib/python3.8/site-packages/awscli/examples/textract/get-document-analysis.rst
+#usr/lib/python3.8/site-packages/awscli/examples/textract/get-document-text-detection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/textract/start-document-analysis.rst
+#usr/lib/python3.8/site-packages/awscli/examples/textract/start-document-text-detection.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/create-language-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/create-medical-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/create-vocabulary-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/create-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/delete-language-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/delete-medical-transcription-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/delete-medical-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/delete-transcription-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/delete-vocabulary-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/delete-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/describe-language-model.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/get-medical-transcription-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/get-medical-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/get-transcription-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/get-vocabulary-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/get-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/list-language-models.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/list-medical-transcription-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/list-medical-vocabularies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/list-transcription-jobs.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/list-vocabularies.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/list-vocabulary-filters.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/start-medical-transcription-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/start-transcription-job.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/update-medical-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/update-vocabulary-filter.rst
+#usr/lib/python3.8/site-packages/awscli/examples/transcribe/update-vocabulary.rst
+#usr/lib/python3.8/site-packages/awscli/examples/translate
+#usr/lib/python3.8/site-packages/awscli/examples/translate/import-terminology.rst
 #usr/lib/python3.8/site-packages/awscli/examples/waf
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/associate-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/put-logging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-byte-match-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-size-constraint-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-sql-injection-match-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf-regional/update-xss-match-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/waf/put-logging-configuration.rst
 #usr/lib/python3.8/site-packages/awscli/examples/waf/update-byte-match-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/waf/update-ip-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/waf/update-rule.rst
@@ -1698,12 +4636,151 @@ usr/lib/python3.8/site-packages/awscli/examples
 #usr/lib/python3.8/site-packages/awscli/examples/waf/update-sql-injection-match-set.rst
 #usr/lib/python3.8/site-packages/awscli/examples/waf/update-web-acl.rst
 #usr/lib/python3.8/site-packages/awscli/examples/waf/update-xss-match-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/associate-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/check-capacity.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/create-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/create-regex-pattern-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/create-rule-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/create-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/delete-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/delete-logging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/delete-regex-pattern-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/delete-rule-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/delete-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/describe-managed-rule-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/disassociate-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-logging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-rate-based-statement-managed-keys.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-regex-pattern-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-rule-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-sampled-requests.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-web-acl-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/get-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-available-managed-rule-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-ip-sets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-logging-configurations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-regex-pattern-sets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-resources-for-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-rule-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/list-web-acls.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/put-logging-configuration.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/update-ip-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/update-regex-pattern-set.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/update-rule-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/wafv2/update-web-acl.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/abort-document-version-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/activate-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/add-resource-permissions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/create-comment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/create-custom-metadata.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/create-folder.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/create-labels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/create-notification-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/create-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/deactivate-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-comment.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-custom-metadata.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-folder-contents.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-folder.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-labels.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-notification-subscription.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/delete-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-activities.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-comments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-document-versions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-folder-contents.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-notification-subscriptions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-resource-permissions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/describe-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/get-document-path.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/get-document-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/get-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/get-folder-path.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/get-folder.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/get-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/initiate-document-version-upload.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/remove-all-resource-permissions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/remove-resource-permission.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/update-document-version.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/update-document.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/update-folder.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workdocs/update-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/associate-delegate-to-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/associate-member-to-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/create-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/create-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/create-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/create-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/delete-access-control-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/delete-alias.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/delete-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/delete-mailbox-permissions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/delete-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/delete-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/deregister-from-work-mail.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/describe-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/describe-organization.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/describe-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/describe-user.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/disassociate-delegate-from-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/disassociate-member-from-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/get-access-control-effect.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/get-mailbox-details.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-access-control-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-aliases.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-group-members.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-mailbox-permissions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-organizations.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-resource-delegates.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-resources.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-tags-for-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/list-users.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/put-access-control-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/put-mailbox-permissions.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/register-to-work-mail.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/reset-password.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/tag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/untag-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/update-mailbox-quota.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/update-primary-email-address.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmail/update-resource.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workmailmessageflow
+#usr/lib/python3.8/site-packages/awscli/examples/workmailmessageflow/get-raw-message-content.rst
 #usr/lib/python3.8/site-packages/awscli/examples/workspaces
 #usr/lib/python3.8/site-packages/awscli/examples/workspaces/create-workspaces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workspaces/describe-tags.rst
 #usr/lib/python3.8/site-packages/awscli/examples/workspaces/describe-workspace-bundles.rst
 #usr/lib/python3.8/site-packages/awscli/examples/workspaces/describe-workspace-directories.rst
 #usr/lib/python3.8/site-packages/awscli/examples/workspaces/describe-workspaces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/workspaces/migrate-workspace.rst
 #usr/lib/python3.8/site-packages/awscli/examples/workspaces/terminate-workspaces.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray
+#usr/lib/python3.8/site-packages/awscli/examples/xray/batch-traces-get.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/create-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/create-sampling-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/delete-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/delete-sampling-rule.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-encryption-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-groups.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-sampling-rules.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-sampling-targets.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-service-graph.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/get-trace-summaries.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/put-encryption-config.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/put-trace-segments.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/update-group.rst
+#usr/lib/python3.8/site-packages/awscli/examples/xray/update-sampling-rule.rst
 usr/lib/python3.8/site-packages/awscli/formatter.py
 usr/lib/python3.8/site-packages/awscli/handlers.py
 usr/lib/python3.8/site-packages/awscli/help.py
diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript
index dd45b5348..983d0b766 100644
--- a/config/rootfiles/packages/ghostscript
+++ b/config/rootfiles/packages/ghostscript
@@ -25,209 +25,208 @@ usr/bin/ps2ps
 usr/bin/ps2ps2
 usr/bin/unix-lpr.sh
 #usr/share/doc/ghostscript
-#usr/share/doc/ghostscript/9.26
-#usr/share/doc/ghostscript/9.26/API.htm
-#usr/share/doc/ghostscript/9.26/C-style.htm
-#usr/share/doc/ghostscript/9.26/Commprod.htm
-#usr/share/doc/ghostscript/9.26/DLL.htm
-#usr/share/doc/ghostscript/9.26/Deprecated.htm
-#usr/share/doc/ghostscript/9.26/Develop.htm
-#usr/share/doc/ghostscript/9.26/Devices.htm
-#usr/share/doc/ghostscript/9.26/Drivers.htm
-#usr/share/doc/ghostscript/9.26/Fonts.htm
-#usr/share/doc/ghostscript/9.26/GS9_Color_Management.pdf
-#usr/share/doc/ghostscript/9.26/History9.htm
-#usr/share/doc/ghostscript/9.26/Install.htm
-#usr/share/doc/ghostscript/9.26/Language.htm
-#usr/share/doc/ghostscript/9.26/Lib.htm
-#usr/share/doc/ghostscript/9.26/Make.htm
-#usr/share/doc/ghostscript/9.26/News.htm
-#usr/share/doc/ghostscript/9.26/Ps-style.htm
-#usr/share/doc/ghostscript/9.26/Ps2epsi.htm
-#usr/share/doc/ghostscript/9.26/Psfiles.htm
-#usr/share/doc/ghostscript/9.26/Readme.htm
-#usr/share/doc/ghostscript/9.26/Release.htm
-#usr/share/doc/ghostscript/9.26/SavedPages.htm
-#usr/share/doc/ghostscript/9.26/Source.htm
-#usr/share/doc/ghostscript/9.26/Unix-lpr.htm
-#usr/share/doc/ghostscript/9.26/Use.htm
-#usr/share/doc/ghostscript/9.26/VectorDevices.htm
-#usr/share/doc/ghostscript/9.26/WhatIsGS.htm
-#usr/share/doc/ghostscript/9.26/gdevds32.c
-#usr/share/doc/ghostscript/9.26/gs-style.css
-#usr/share/doc/ghostscript/9.26/images
-#usr/share/doc/ghostscript/9.26/images/Artifex_logo.png
-#usr/share/doc/ghostscript/9.26/images/favicon.png
-#usr/share/doc/ghostscript/9.26/images/ghostscript_logo.png
-#usr/share/doc/ghostscript/9.26/images/hamburger-light.png
-#usr/share/doc/ghostscript/9.26/images/x-light.png
-#usr/share/doc/ghostscript/9.26/index.html
-#usr/share/doc/ghostscript/9.26/index.js
-#usr/share/doc/ghostscript/9.26/pscet_status.txt
-#usr/share/doc/ghostscript/9.26/sample_downscale_device.htm
-#usr/share/doc/ghostscript/9.26/style.css
-#usr/share/doc/ghostscript/9.26/subclass.htm
-#usr/share/doc/ghostscript/9.26/thirdparty.htm
+#usr/share/doc/ghostscript/9.53.3
+#usr/share/doc/ghostscript/9.53.3/API.htm
+#usr/share/doc/ghostscript/9.53.3/C-style.htm
+#usr/share/doc/ghostscript/9.53.3/COPYING
+#usr/share/doc/ghostscript/9.53.3/Commprod.htm
+#usr/share/doc/ghostscript/9.53.3/DLL.htm
+#usr/share/doc/ghostscript/9.53.3/Deprecated.htm
+#usr/share/doc/ghostscript/9.53.3/Develop.htm
+#usr/share/doc/ghostscript/9.53.3/Devices.htm
+#usr/share/doc/ghostscript/9.53.3/Drivers.htm
+#usr/share/doc/ghostscript/9.53.3/Fonts.htm
+#usr/share/doc/ghostscript/9.53.3/GS9_Color_Management.pdf
+#usr/share/doc/ghostscript/9.53.3/History9.htm
+#usr/share/doc/ghostscript/9.53.3/Install.htm
+#usr/share/doc/ghostscript/9.53.3/Language.htm
+#usr/share/doc/ghostscript/9.53.3/Lib.htm
+#usr/share/doc/ghostscript/9.53.3/Make.htm
+#usr/share/doc/ghostscript/9.53.3/News.htm
+#usr/share/doc/ghostscript/9.53.3/Ps-style.htm
+#usr/share/doc/ghostscript/9.53.3/Ps2epsi.htm
+#usr/share/doc/ghostscript/9.53.3/Psfiles.htm
+#usr/share/doc/ghostscript/9.53.3/Readme.htm
+#usr/share/doc/ghostscript/9.53.3/Release.htm
+#usr/share/doc/ghostscript/9.53.3/SavedPages.htm
+#usr/share/doc/ghostscript/9.53.3/Source.htm
+#usr/share/doc/ghostscript/9.53.3/Unix-lpr.htm
+#usr/share/doc/ghostscript/9.53.3/Use.htm
+#usr/share/doc/ghostscript/9.53.3/VectorDevices.htm
+#usr/share/doc/ghostscript/9.53.3/WhatIsGS.htm
+#usr/share/doc/ghostscript/9.53.3/gdevds32.c
+#usr/share/doc/ghostscript/9.53.3/gs-style.css
+#usr/share/doc/ghostscript/9.53.3/images
+#usr/share/doc/ghostscript/9.53.3/images/Artifex_logo.png
+#usr/share/doc/ghostscript/9.53.3/images/favicon.png
+#usr/share/doc/ghostscript/9.53.3/images/ghostscript_logo.png
+#usr/share/doc/ghostscript/9.53.3/images/hamburger-light.png
+#usr/share/doc/ghostscript/9.53.3/images/x-light.png
+#usr/share/doc/ghostscript/9.53.3/index.html
+#usr/share/doc/ghostscript/9.53.3/index.js
+#usr/share/doc/ghostscript/9.53.3/pscet_status.txt
+#usr/share/doc/ghostscript/9.53.3/sample_downscale_device.htm
+#usr/share/doc/ghostscript/9.53.3/style.css
+#usr/share/doc/ghostscript/9.53.3/subclass.htm
+#usr/share/doc/ghostscript/9.53.3/thirdparty.htm
 #usr/share/ghostscript
-#usr/share/ghostscript/9.26
-#usr/share/ghostscript/9.26/lib
-#usr/share/ghostscript/9.26/lib/PDFA_def.ps
-#usr/share/ghostscript/9.26/lib/PDFX_def.ps
-#usr/share/ghostscript/9.26/lib/PM760p.upp
-#usr/share/ghostscript/9.26/lib/PM760pl.upp
-#usr/share/ghostscript/9.26/lib/PM820p.upp
-#usr/share/ghostscript/9.26/lib/PM820pl.upp
-#usr/share/ghostscript/9.26/lib/Stc670p.upp
-#usr/share/ghostscript/9.26/lib/Stc670pl.upp
-#usr/share/ghostscript/9.26/lib/Stc680p.upp
-#usr/share/ghostscript/9.26/lib/Stc680pl.upp
-#usr/share/ghostscript/9.26/lib/Stc740p.upp
-#usr/share/ghostscript/9.26/lib/Stc740pl.upp
-#usr/share/ghostscript/9.26/lib/Stc760p.upp
-#usr/share/ghostscript/9.26/lib/Stc760pl.upp
-#usr/share/ghostscript/9.26/lib/Stc777p.upp
-#usr/share/ghostscript/9.26/lib/Stc777pl.upp
-#usr/share/ghostscript/9.26/lib/Stp720p.upp
-#usr/share/ghostscript/9.26/lib/Stp720pl.upp
-#usr/share/ghostscript/9.26/lib/Stp870p.upp
-#usr/share/ghostscript/9.26/lib/Stp870pl.upp
-#usr/share/ghostscript/9.26/lib/acctest.ps
-#usr/share/ghostscript/9.26/lib/align.ps
-#usr/share/ghostscript/9.26/lib/bj8.rpd
-#usr/share/ghostscript/9.26/lib/bj8gc12f.upp
-#usr/share/ghostscript/9.26/lib/bj8hg12f.upp
-#usr/share/ghostscript/9.26/lib/bj8oh06n.upp
-#usr/share/ghostscript/9.26/lib/bj8pa06n.upp
-#usr/share/ghostscript/9.26/lib/bj8pp12f.upp
-#usr/share/ghostscript/9.26/lib/bj8ts06n.upp
-#usr/share/ghostscript/9.26/lib/bjc6000a1.upp
-#usr/share/ghostscript/9.26/lib/bjc6000b1.upp
-#usr/share/ghostscript/9.26/lib/bjc610a0.upp
-#usr/share/ghostscript/9.26/lib/bjc610a1.upp
-#usr/share/ghostscript/9.26/lib/bjc610a2.upp
-#usr/share/ghostscript/9.26/lib/bjc610a3.upp
-#usr/share/ghostscript/9.26/lib/bjc610a4.upp
-#usr/share/ghostscript/9.26/lib/bjc610a5.upp
-#usr/share/ghostscript/9.26/lib/bjc610a6.upp
-#usr/share/ghostscript/9.26/lib/bjc610a7.upp
-#usr/share/ghostscript/9.26/lib/bjc610a8.upp
-#usr/share/ghostscript/9.26/lib/bjc610b1.upp
-#usr/share/ghostscript/9.26/lib/bjc610b2.upp
-#usr/share/ghostscript/9.26/lib/bjc610b3.upp
-#usr/share/ghostscript/9.26/lib/bjc610b4.upp
-#usr/share/ghostscript/9.26/lib/bjc610b6.upp
-#usr/share/ghostscript/9.26/lib/bjc610b7.upp
-#usr/share/ghostscript/9.26/lib/bjc610b8.upp
-#usr/share/ghostscript/9.26/lib/caption.ps
-#usr/share/ghostscript/9.26/lib/cbjc600.ppd
-#usr/share/ghostscript/9.26/lib/cbjc800.ppd
-#usr/share/ghostscript/9.26/lib/cdj550.upp
-#usr/share/ghostscript/9.26/lib/cdj690.upp
-#usr/share/ghostscript/9.26/lib/cdj690ec.upp
-#usr/share/ghostscript/9.26/lib/cid2code.ps
-#usr/share/ghostscript/9.26/lib/dmp_init.ps
-#usr/share/ghostscript/9.26/lib/dmp_site.ps
-#usr/share/ghostscript/9.26/lib/dnj750c.upp
-#usr/share/ghostscript/9.26/lib/dnj750m.upp
-#usr/share/ghostscript/9.26/lib/docie.ps
-#usr/share/ghostscript/9.26/lib/escp_24.src
-#usr/share/ghostscript/9.26/lib/font2pcl.ps
-#usr/share/ghostscript/9.26/lib/ghostpdf.ppd
-#usr/share/ghostscript/9.26/lib/gs_ce_e.ps
-#usr/share/ghostscript/9.26/lib/gs_il2_e.ps
-#usr/share/ghostscript/9.26/lib/gs_kanji.ps
-#usr/share/ghostscript/9.26/lib/gs_ksb_e.ps
-#usr/share/ghostscript/9.26/lib/gs_l.xbm
-#usr/share/ghostscript/9.26/lib/gs_l.xpm
-#usr/share/ghostscript/9.26/lib/gs_l_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_lgo_e.ps
-#usr/share/ghostscript/9.26/lib/gs_lgx_e.ps
-#usr/share/ghostscript/9.26/lib/gs_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_m.xpm
-#usr/share/ghostscript/9.26/lib/gs_m_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_s.xbm
-#usr/share/ghostscript/9.26/lib/gs_s.xpm
-#usr/share/ghostscript/9.26/lib/gs_s_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_t.xbm
-#usr/share/ghostscript/9.26/lib/gs_t.xpm
-#usr/share/ghostscript/9.26/lib/gs_t_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_wl1_e.ps
-#usr/share/ghostscript/9.26/lib/gs_wl2_e.ps
-#usr/share/ghostscript/9.26/lib/gs_wl5_e.ps
-#usr/share/ghostscript/9.26/lib/gslp.ps
-#usr/share/ghostscript/9.26/lib/gsnup.ps
-#usr/share/ghostscript/9.26/lib/ht_ccsto.ps
-#usr/share/ghostscript/9.26/lib/image-qa.ps
-#usr/share/ghostscript/9.26/lib/jispaper.ps
-#usr/share/ghostscript/9.26/lib/landscap.ps
-#usr/share/ghostscript/9.26/lib/lines.ps
-#usr/share/ghostscript/9.26/lib/mkcidfm.ps
-#usr/share/ghostscript/9.26/lib/necp2x.upp
-#usr/share/ghostscript/9.26/lib/necp2x6.upp
-#usr/share/ghostscript/9.26/lib/pdf2dsc.ps
-#usr/share/ghostscript/9.26/lib/pf2afm.ps
-#usr/share/ghostscript/9.26/lib/pfbtopfa.ps
-#usr/share/ghostscript/9.26/lib/ppath.ps
-#usr/share/ghostscript/9.26/lib/pphs.ps
-#usr/share/ghostscript/9.26/lib/prfont.ps
-#usr/share/ghostscript/9.26/lib/printafm.ps
-#usr/share/ghostscript/9.26/lib/ps2ai.ps
-#usr/share/ghostscript/9.26/lib/ps2epsi.ps
-#usr/share/ghostscript/9.26/lib/ras1.upp
-#usr/share/ghostscript/9.26/lib/ras24.upp
-#usr/share/ghostscript/9.26/lib/ras3.upp
-#usr/share/ghostscript/9.26/lib/ras32.upp
-#usr/share/ghostscript/9.26/lib/ras4.upp
-#usr/share/ghostscript/9.26/lib/ras8m.upp
-#usr/share/ghostscript/9.26/lib/rollconv.ps
-#usr/share/ghostscript/9.26/lib/s400a1.upp
-#usr/share/ghostscript/9.26/lib/s400b1.upp
-#usr/share/ghostscript/9.26/lib/sharp.upp
-#usr/share/ghostscript/9.26/lib/sipixa6.upp
-#usr/share/ghostscript/9.26/lib/st640ih.upp
-#usr/share/ghostscript/9.26/lib/st640ihg.upp
-#usr/share/ghostscript/9.26/lib/st640p.upp
-#usr/share/ghostscript/9.26/lib/st640pg.upp
-#usr/share/ghostscript/9.26/lib/st640pl.upp
-#usr/share/ghostscript/9.26/lib/st640plg.upp
-#usr/share/ghostscript/9.26/lib/stc.upp
-#usr/share/ghostscript/9.26/lib/stc1520h.upp
-#usr/share/ghostscript/9.26/lib/stc2.upp
-#usr/share/ghostscript/9.26/lib/stc200_h.upp
-#usr/share/ghostscript/9.26/lib/stc2_h.upp
-#usr/share/ghostscript/9.26/lib/stc2s_h.upp
-#usr/share/ghostscript/9.26/lib/stc300.upp
-#usr/share/ghostscript/9.26/lib/stc300bl.upp
-#usr/share/ghostscript/9.26/lib/stc300bm.upp
-#usr/share/ghostscript/9.26/lib/stc500p.upp
-#usr/share/ghostscript/9.26/lib/stc500ph.upp
-#usr/share/ghostscript/9.26/lib/stc600ih.upp
-#usr/share/ghostscript/9.26/lib/stc600p.upp
-#usr/share/ghostscript/9.26/lib/stc600pl.upp
-#usr/share/ghostscript/9.26/lib/stc640p.upp
-#usr/share/ghostscript/9.26/lib/stc740ih.upp
-#usr/share/ghostscript/9.26/lib/stc800ih.upp
-#usr/share/ghostscript/9.26/lib/stc800p.upp
-#usr/share/ghostscript/9.26/lib/stc800pl.upp
-#usr/share/ghostscript/9.26/lib/stc_h.upp
-#usr/share/ghostscript/9.26/lib/stc_l.upp
-#usr/share/ghostscript/9.26/lib/stcany.upp
-#usr/share/ghostscript/9.26/lib/stcany_h.upp
-#usr/share/ghostscript/9.26/lib/stcinfo.ps
-#usr/share/ghostscript/9.26/lib/stcolor.ps
-#usr/share/ghostscript/9.26/lib/stocht.ps
-#usr/share/ghostscript/9.26/lib/traceimg.ps
-#usr/share/ghostscript/9.26/lib/traceop.ps
-#usr/share/ghostscript/9.26/lib/uninfo.ps
-#usr/share/ghostscript/9.26/lib/viewcmyk.ps
-#usr/share/ghostscript/9.26/lib/viewgif.ps
-#usr/share/ghostscript/9.26/lib/viewjpeg.ps
-#usr/share/ghostscript/9.26/lib/viewmiff.ps
-#usr/share/ghostscript/9.26/lib/viewpbm.ps
-#usr/share/ghostscript/9.26/lib/viewpcx.ps
-#usr/share/ghostscript/9.26/lib/viewps2a.ps
-#usr/share/ghostscript/9.26/lib/winmaps.ps
-#usr/share/ghostscript/9.26/lib/zeroline.ps
+#usr/share/ghostscript/9.53.3
+#usr/share/ghostscript/9.53.3/lib
+#usr/share/ghostscript/9.53.3/lib/PDFA_def.ps
+#usr/share/ghostscript/9.53.3/lib/PDFX_def.ps
+#usr/share/ghostscript/9.53.3/lib/PM760p.upp
+#usr/share/ghostscript/9.53.3/lib/PM760pl.upp
+#usr/share/ghostscript/9.53.3/lib/PM820p.upp
+#usr/share/ghostscript/9.53.3/lib/PM820pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc670p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc670pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc680p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc680pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc740p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc740pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc760p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc760pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc777p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc777pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stp720p.upp
+#usr/share/ghostscript/9.53.3/lib/Stp720pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stp870p.upp
+#usr/share/ghostscript/9.53.3/lib/Stp870pl.upp
+#usr/share/ghostscript/9.53.3/lib/acctest.ps
+#usr/share/ghostscript/9.53.3/lib/align.ps
+#usr/share/ghostscript/9.53.3/lib/bj8.rpd
+#usr/share/ghostscript/9.53.3/lib/bj8gc12f.upp
+#usr/share/ghostscript/9.53.3/lib/bj8hg12f.upp
+#usr/share/ghostscript/9.53.3/lib/bj8oh06n.upp
+#usr/share/ghostscript/9.53.3/lib/bj8pa06n.upp
+#usr/share/ghostscript/9.53.3/lib/bj8pp12f.upp
+#usr/share/ghostscript/9.53.3/lib/bj8ts06n.upp
+#usr/share/ghostscript/9.53.3/lib/bjc6000a1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc6000b1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a0.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a2.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a3.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a4.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a5.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a6.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a7.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a8.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b2.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b3.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b4.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b6.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b7.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b8.upp
+#usr/share/ghostscript/9.53.3/lib/caption.ps
+#usr/share/ghostscript/9.53.3/lib/cbjc600.ppd
+#usr/share/ghostscript/9.53.3/lib/cbjc800.ppd
+#usr/share/ghostscript/9.53.3/lib/cdj550.upp
+#usr/share/ghostscript/9.53.3/lib/cdj690.upp
+#usr/share/ghostscript/9.53.3/lib/cdj690ec.upp
+#usr/share/ghostscript/9.53.3/lib/cid2code.ps
+#usr/share/ghostscript/9.53.3/lib/dnj750c.upp
+#usr/share/ghostscript/9.53.3/lib/dnj750m.upp
+#usr/share/ghostscript/9.53.3/lib/docie.ps
+#usr/share/ghostscript/9.53.3/lib/font2pcl.ps
+#usr/share/ghostscript/9.53.3/lib/ghostpdf.ppd
+#usr/share/ghostscript/9.53.3/lib/gs_ce_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_il2_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_kanji.ps
+#usr/share/ghostscript/9.53.3/lib/gs_ksb_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_l.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_l.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_l_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_lgo_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_lgx_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_m.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_m_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_s.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_s.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_s_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_t.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_t.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_t_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_wl1_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_wl2_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_wl5_e.ps
+#usr/share/ghostscript/9.53.3/lib/gslp.ps
+#usr/share/ghostscript/9.53.3/lib/gsnup.ps
+#usr/share/ghostscript/9.53.3/lib/ht_ccsto.ps
+#usr/share/ghostscript/9.53.3/lib/image-qa.ps
+#usr/share/ghostscript/9.53.3/lib/jispaper.ps
+#usr/share/ghostscript/9.53.3/lib/landscap.ps
+#usr/share/ghostscript/9.53.3/lib/lines.ps
+#usr/share/ghostscript/9.53.3/lib/mkcidfm.ps
+#usr/share/ghostscript/9.53.3/lib/necp2x.upp
+#usr/share/ghostscript/9.53.3/lib/necp2x6.upp
+#usr/share/ghostscript/9.53.3/lib/pdf2dsc.ps
+#usr/share/ghostscript/9.53.3/lib/pdf_info.ps
+#usr/share/ghostscript/9.53.3/lib/pf2afm.ps
+#usr/share/ghostscript/9.53.3/lib/pfbtopfa.ps
+#usr/share/ghostscript/9.53.3/lib/ppath.ps
+#usr/share/ghostscript/9.53.3/lib/pphs.ps
+#usr/share/ghostscript/9.53.3/lib/prfont.ps
+#usr/share/ghostscript/9.53.3/lib/printafm.ps
+#usr/share/ghostscript/9.53.3/lib/ps2ai.ps
+#usr/share/ghostscript/9.53.3/lib/ps2epsi.ps
+#usr/share/ghostscript/9.53.3/lib/ras1.upp
+#usr/share/ghostscript/9.53.3/lib/ras24.upp
+#usr/share/ghostscript/9.53.3/lib/ras3.upp
+#usr/share/ghostscript/9.53.3/lib/ras32.upp
+#usr/share/ghostscript/9.53.3/lib/ras4.upp
+#usr/share/ghostscript/9.53.3/lib/ras8m.upp
+#usr/share/ghostscript/9.53.3/lib/rollconv.ps
+#usr/share/ghostscript/9.53.3/lib/s400a1.upp
+#usr/share/ghostscript/9.53.3/lib/s400b1.upp
+#usr/share/ghostscript/9.53.3/lib/sharp.upp
+#usr/share/ghostscript/9.53.3/lib/sipixa6.upp
+#usr/share/ghostscript/9.53.3/lib/st640ih.upp
+#usr/share/ghostscript/9.53.3/lib/st640ihg.upp
+#usr/share/ghostscript/9.53.3/lib/st640p.upp
+#usr/share/ghostscript/9.53.3/lib/st640pg.upp
+#usr/share/ghostscript/9.53.3/lib/st640pl.upp
+#usr/share/ghostscript/9.53.3/lib/st640plg.upp
+#usr/share/ghostscript/9.53.3/lib/stc.upp
+#usr/share/ghostscript/9.53.3/lib/stc1520h.upp
+#usr/share/ghostscript/9.53.3/lib/stc2.upp
+#usr/share/ghostscript/9.53.3/lib/stc200_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc2_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc2s_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc300.upp
+#usr/share/ghostscript/9.53.3/lib/stc300bl.upp
+#usr/share/ghostscript/9.53.3/lib/stc300bm.upp
+#usr/share/ghostscript/9.53.3/lib/stc500p.upp
+#usr/share/ghostscript/9.53.3/lib/stc500ph.upp
+#usr/share/ghostscript/9.53.3/lib/stc600ih.upp
+#usr/share/ghostscript/9.53.3/lib/stc600p.upp
+#usr/share/ghostscript/9.53.3/lib/stc600pl.upp
+#usr/share/ghostscript/9.53.3/lib/stc640p.upp
+#usr/share/ghostscript/9.53.3/lib/stc740ih.upp
+#usr/share/ghostscript/9.53.3/lib/stc800ih.upp
+#usr/share/ghostscript/9.53.3/lib/stc800p.upp
+#usr/share/ghostscript/9.53.3/lib/stc800pl.upp
+#usr/share/ghostscript/9.53.3/lib/stc_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc_l.upp
+#usr/share/ghostscript/9.53.3/lib/stcany.upp
+#usr/share/ghostscript/9.53.3/lib/stcany_h.upp
+#usr/share/ghostscript/9.53.3/lib/stcinfo.ps
+#usr/share/ghostscript/9.53.3/lib/stcolor.ps
+#usr/share/ghostscript/9.53.3/lib/stocht.ps
+#usr/share/ghostscript/9.53.3/lib/traceimg.ps
+#usr/share/ghostscript/9.53.3/lib/traceop.ps
+#usr/share/ghostscript/9.53.3/lib/uninfo.ps
+#usr/share/ghostscript/9.53.3/lib/viewcmyk.ps
+#usr/share/ghostscript/9.53.3/lib/viewgif.ps
+#usr/share/ghostscript/9.53.3/lib/viewjpeg.ps
+#usr/share/ghostscript/9.53.3/lib/viewmiff.ps
+#usr/share/ghostscript/9.53.3/lib/viewpbm.ps
+#usr/share/ghostscript/9.53.3/lib/viewpcx.ps
+#usr/share/ghostscript/9.53.3/lib/viewps2a.ps
+#usr/share/ghostscript/9.53.3/lib/winmaps.ps
+#usr/share/ghostscript/9.53.3/lib/zeroline.ps
 #usr/share/ghostscript/fonts
 #usr/share/ghostscript/fonts/COPYING
 #usr/share/ghostscript/fonts/ChangeLog
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index df159acb4..c2023a326 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -333,9 +333,9 @@ usr/share/perl5/FromCPAN/Error.pm
 usr/share/perl5/Git.pm
 usr/share/perl5/Git/I18N.pm
 usr/share/perl5/Git/IndexInfo.pm
-#usr/share/perl5/Git/LoadCPAN
-#usr/share/perl5/Git/LoadCPAN.pm
-#usr/share/perl5/Git/LoadCPAN/Error.pm
+usr/share/perl5/Git/LoadCPAN
+usr/share/perl5/Git/LoadCPAN.pm
+usr/share/perl5/Git/LoadCPAN/Error.pm
 #usr/share/perl5/Git/LoadCPAN/Mail
 #usr/share/perl5/Git/LoadCPAN/Mail/Address.pm
 #usr/share/perl5/Git/Packet.pm
diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
index db2bc1ee6..f6b0fbfa2 100644
--- a/config/rootfiles/packages/i586/vdr_dvbapi
+++ b/config/rootfiles/packages/i586/vdr_dvbapi
@@ -1,4 +1,4 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1-sse
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4-sse
diff --git a/config/rootfiles/packages/libseccomp b/config/rootfiles/packages/libseccomp
index 081103b21..214c14328 100644
--- a/config/rootfiles/packages/libseccomp
+++ b/config/rootfiles/packages/libseccomp
@@ -4,7 +4,7 @@ usr/bin/scmp_sys_resolver
 #usr/lib/libseccomp.la
 #usr/lib/libseccomp.so
 usr/lib/libseccomp.so.2
-usr/lib/libseccomp.so.2.4.3
+usr/lib/libseccomp.so.2.4.4
 #usr/lib/pkgconfig/libseccomp.pc
 #usr/share/man/man1/scmp_sys_resolver.1
 #usr/share/man/man3/seccomp_api_get.3
diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis
index 7df7cea2e..a7ca0e3dd 100644
--- a/config/rootfiles/packages/lynis
+++ b/config/rootfiles/packages/lynis
@@ -15,6 +15,7 @@ var/ipfire/lynis/db/languages/br
 var/ipfire/lynis/db/languages/cn
 var/ipfire/lynis/db/languages/da
 var/ipfire/lynis/db/languages/de
+var/ipfire/lynis/db/languages/de-AT
 var/ipfire/lynis/db/languages/en
 var/ipfire/lynis/db/languages/en-GB
 var/ipfire/lynis/db/languages/en-US
diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware
index 21b20ab03..ec6c5b287 100644
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,7 +1,8 @@
 #lib/firmware/pcengines
 #lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu2_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu3_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu4_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu5_v4.11.0.6.rom
+lib/firmware/pcengines/apu/apu1_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu2_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu3_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu4_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu5_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu6_v4.12.0.6.rom
diff --git a/config/rootfiles/packages/python3-botocore b/config/rootfiles/packages/python3-botocore
index 2b0630f70..c8d59974f 100644
--- a/config/rootfiles/packages/python3-botocore
+++ b/config/rootfiles/packages/python3-botocore
@@ -1,10 +1,10 @@
 #usr/lib/python3.8/site-packages/botocore
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/PKG-INFO
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/SOURCES.txt
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/dependency_links.txt
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/requires.txt
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/top_level.txt
 usr/lib/python3.8/site-packages/botocore/__init__.py
 usr/lib/python3.8/site-packages/botocore/args.py
 usr/lib/python3.8/site-packages/botocore/auth.py
@@ -43,6 +43,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25
 #usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/apigateway
 #usr/lib/python3.8/site-packages/botocore/data/apigateway/2015-07-09
 #usr/lib/python3.8/site-packages/botocore/data/apigateway/2015-07-09/examples-1.json
@@ -60,6 +64,14 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09
 #usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/appflow
+#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23
+#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/application-autoscaling
 #usr/lib/python3.8/site-packages/botocore/data/application-autoscaling/2016-02-06
 #usr/lib/python3.8/site-packages/botocore/data/application-autoscaling/2016-02-06/examples-1.json
@@ -111,6 +123,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/braket
+#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01
+#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/budgets
 #usr/lib/python3.8/site-packages/botocore/data/budgets/2016-10-20
 #usr/lib/python3.8/site-packages/botocore/data/budgets/2016-10-20/examples-1.json
@@ -223,6 +239,11 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/examples-1.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudhsm
 #usr/lib/python3.8/site-packages/botocore/data/cloudhsm/2014-05-30
 #usr/lib/python3.8/site-packages/botocore/data/cloudhsm/2014-05-30/examples-1.json
@@ -254,6 +275,11 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/paginators-1.sdk-extras.json
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/codebuild
 #usr/lib/python3.8/site-packages/botocore/data/codebuild/2016-10-06
 #usr/lib/python3.8/site-packages/botocore/data/codebuild/2016-10-06/examples-1.json
@@ -328,6 +354,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/config/2014-11-12/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/config/2014-11-12/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/connect
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08
 #usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08/paginators-1.json
@@ -341,6 +371,14 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/databrew
+#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25
+#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/dataexchange
 #usr/lib/python3.8/site-packages/botocore/data/dataexchange/2017-07-25
 #usr/lib/python3.8/site-packages/botocore/data/dataexchange/2017-07-25/paginators-1.json
@@ -367,6 +405,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/directconnect
 #usr/lib/python3.8/site-packages/botocore/data/directconnect/2012-10-25
 #usr/lib/python3.8/site-packages/botocore/data/directconnect/2012-10-25/examples-1.json
@@ -392,6 +434,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/service-2.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ds
 #usr/lib/python3.8/site-packages/botocore/data/ds/2015-04-16
@@ -453,6 +496,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/ec2/2016-11-15/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ec2/2016-11-15/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ecr
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21
 #usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21/paginators-1.json
@@ -495,6 +542,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/elastictranscoder
 #usr/lib/python3.8/site-packages/botocore/data/elastictranscoder/2012-09-25
 #usr/lib/python3.8/site-packages/botocore/data/elastictranscoder/2012-09-25/examples-1.json
@@ -595,12 +643,21 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/honeycode
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/iam
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/identitystore
+#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15
+#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/imagebuilder
 #usr/lib/python3.8/site-packages/botocore/data/imagebuilder/2019-12-02
 #usr/lib/python3.8/site-packages/botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -619,6 +676,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/iot
 #usr/lib/python3.8/site-packages/botocore/data/iot-data
 #usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28
+#usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/iot-jobs-data
 #usr/lib/python3.8/site-packages/botocore/data/iot-jobs-data/2017-09-29
@@ -664,6 +722,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06
 #usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/ivs
+#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14
+#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/kafka
 #usr/lib/python3.8/site-packages/botocore/data/kafka/2018-11-14
 #usr/lib/python3.8/site-packages/botocore/data/kafka/2018-11-14/paginators-1.json
@@ -747,6 +809,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/machinelearning
 #usr/lib/python3.8/site-packages/botocore/data/machinelearning/2014-12-12
 #usr/lib/python3.8/site-packages/botocore/data/machinelearning/2014-12-12/examples-1.json
@@ -758,6 +824,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/macie2
+#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01
+#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/managedblockchain
 #usr/lib/python3.8/site-packages/botocore/data/managedblockchain/2018-09-24
 #usr/lib/python3.8/site-packages/botocore/data/managedblockchain/2018-09-24/paginators-1.json
@@ -839,6 +909,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/mwaa
+#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01
+#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/neptune
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/examples-1.json
@@ -846,6 +920,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/service-2.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/networkmanager
 #usr/lib/python3.8/site-packages/botocore/data/networkmanager/2019-07-05
 #usr/lib/python3.8/site-packages/botocore/data/networkmanager/2019-07-05/paginators-1.json
@@ -941,6 +1019,11 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/rds/2014-10-31/service-2.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/rds/2014-10-31/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/redshift
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/paginators-1.sdk-extras.json
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01
 #usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01/paginators-1.json
@@ -980,6 +1063,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/paginators-1.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/s3
 #usr/lib/python3.8/site-packages/botocore/data/s3/2006-03-01
@@ -991,11 +1075,19 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20
 #usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime/2017-05-13
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime/2017-05-13/examples-1.json
@@ -1038,6 +1130,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/service-quotas/2019-06-24/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/service-quotas/2019-06-24/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10/paginators-1.json
@@ -1096,7 +1192,12 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sso
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sso-oidc
 #usr/lib/python3.8/site-packages/botocore/data/sso-oidc/2019-06-10
 #usr/lib/python3.8/site-packages/botocore/data/sso-oidc/2019-06-10/paginators-1.json
@@ -1137,6 +1238,14 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27
 #usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/transcribe
 #usr/lib/python3.8/site-packages/botocore/data/transcribe/2017-10-26
 #usr/lib/python3.8/site-packages/botocore/data/transcribe/2017-10-26/examples-1.json
@@ -1198,11 +1307,9 @@ usr/lib/python3.8/site-packages/botocore/discovery.py
 usr/lib/python3.8/site-packages/botocore/docs/__init__.py
 #usr/lib/python3.8/site-packages/botocore/docs/bcdoc
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/__init__.py
-usr/lib/python3.8/site-packages/botocore/docs/bcdoc/docevents.py
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/docstringparser.py
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/restdoc.py
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/style.py
-usr/lib/python3.8/site-packages/botocore/docs/bcdoc/textwriter.py
 usr/lib/python3.8/site-packages/botocore/docs/client.py
 usr/lib/python3.8/site-packages/botocore/docs/docstring.py
 usr/lib/python3.8/site-packages/botocore/docs/example.py
diff --git a/config/rootfiles/packages/python3-urllib3 b/config/rootfiles/packages/python3-urllib3
new file mode 100644
index 000000000..1bb68c774
--- /dev/null
+++ b/config/rootfiles/packages/python3-urllib3
@@ -0,0 +1,52 @@
+usr/lib/python3.8/site-packages/urllib3
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/urllib3/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/_collections.py
+#usr/lib/python3.8/site-packages/urllib3/_version.py
+#usr/lib/python3.8/site-packages/urllib3/connection.py
+#usr/lib/python3.8/site-packages/urllib3/connectionpool.py
+#usr/lib/python3.8/site-packages/urllib3/contrib
+#usr/lib/python3.8/site-packages/urllib3/contrib/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_appengine_environ.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/bindings.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/low_level.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/appengine.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/ntlmpool.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/pyopenssl.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/securetransport.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/socks.py
+#usr/lib/python3.8/site-packages/urllib3/exceptions.py
+#usr/lib/python3.8/site-packages/urllib3/fields.py
+#usr/lib/python3.8/site-packages/urllib3/filepost.py
+#usr/lib/python3.8/site-packages/urllib3/packages
+#usr/lib/python3.8/site-packages/urllib3/packages/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/packages/backports
+#usr/lib/python3.8/site-packages/urllib3/packages/backports/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/packages/backports/makefile.py
+#usr/lib/python3.8/site-packages/urllib3/packages/six.py
+#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname
+#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname/_implementation.py
+#usr/lib/python3.8/site-packages/urllib3/poolmanager.py
+#usr/lib/python3.8/site-packages/urllib3/request.py
+#usr/lib/python3.8/site-packages/urllib3/response.py
+#usr/lib/python3.8/site-packages/urllib3/util
+#usr/lib/python3.8/site-packages/urllib3/util/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/util/connection.py
+#usr/lib/python3.8/site-packages/urllib3/util/proxy.py
+#usr/lib/python3.8/site-packages/urllib3/util/queue.py
+#usr/lib/python3.8/site-packages/urllib3/util/request.py
+#usr/lib/python3.8/site-packages/urllib3/util/response.py
+#usr/lib/python3.8/site-packages/urllib3/util/retry.py
+#usr/lib/python3.8/site-packages/urllib3/util/ssl_.py
+#usr/lib/python3.8/site-packages/urllib3/util/ssltransport.py
+#usr/lib/python3.8/site-packages/urllib3/util/timeout.py
+#usr/lib/python3.8/site-packages/urllib3/util/url.py
+#usr/lib/python3.8/site-packages/urllib3/util/wait.py
diff --git a/config/rootfiles/packages/spamassassin b/config/rootfiles/packages/spamassassin
deleted file mode 100644
index fb916edd8..000000000
--- a/config/rootfiles/packages/spamassassin
+++ /dev/null
@@ -1,228 +0,0 @@
-etc/mail
-#etc/mail/spamassassin
-#etc/mail/spamassassin/init.pre
-#etc/mail/spamassassin/local.cf
-#etc/mail/spamassassin/v310.pre
-#etc/mail/spamassassin/v312.pre
-#etc/mail/spamassassin/v320.pre
-#etc/mail/spamassassin/v330.pre
-#etc/mail/spamassassin/v340.pre
-#etc/mail/spamassassin/v341.pre
-#etc/mail/spamassassin/v342.pre
-etc/rc.d/init.d/spamassassin
-usr/bin/sa-awl
-usr/bin/sa-check_spamd
-usr/bin/sa-compile
-usr/bin/sa-learn
-usr/bin/sa-update
-usr/bin/spamassassin
-usr/bin/spamc
-usr/bin/spamd
-usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/AICache.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/ArchiveIterator.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/AsyncLoop.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/AutoWhitelist.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes/CombineChi.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/BDB.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/DBM.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/MySQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/PgSQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/Redis.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/SDBM.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/SQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Client.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf/LDAP.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf/Parser.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf/SQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Constants.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/DBBasedAddrList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Dns.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/DnsResolver.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/HTML.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locales.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker/Flock.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker/Win32.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger/File.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger/Stderr.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger/Syslog.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/MailingList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Metadata
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Metadata.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Metadata/Received.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Node.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/NetSet.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PerMsgLearner.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PerMsgStatus.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PersistentAddrList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ASN.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AWL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AccessDB.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AntiVirus.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AskDNS.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Bayes.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/BodyEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Check.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/DCC.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/DKIM.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/DNSEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/FreeMail.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HTMLEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HashBL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Hashcash.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HeaderEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ImageInfo.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/MIMEEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/MIMEHeader.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/PDFInfo.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/PhishTag.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Phishing.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Pyzor.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Razor2.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/RelayCountry.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/RelayEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ReplaceTags.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ResourceLimits.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Reuse.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/SPF.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Shortcircuit.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/SpamCop.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Test.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/TextCat.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/TxRep.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URIDNSBL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URIDetail.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URIEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URILocalBL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/VBounce.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/WLBLEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PluginHandler.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/RegistryBoundaries.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Reporter.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/SQLBasedAddrList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/SpamdForkScaling.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/SubProcBackChannel.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Timeout.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/DependencyInfo.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/Progress.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/ScopedTimer.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/TieOneStringHash.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/TinyRedis.pm
-#usr/lib/perl5/site_perl/5.30.0/spamassassin-run.pod
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Mail/SpamAssassin
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
-#usr/share/man/man1/sa-awl.1
-#usr/share/man/man1/sa-compile.1
-#usr/share/man/man1/sa-learn.1
-#usr/share/man/man1/sa-update.1
-#usr/share/man/man1/spamassassin-run.1
-#usr/share/man/man1/spamassassin.1
-#usr/share/man/man1/spamc.1
-#usr/share/man/man1/spamd.1
-#usr/share/man/man3/Mail::SpamAssassin.3
-#usr/share/man/man3/Mail::SpamAssassin::AICache.3
-#usr/share/man/man3/Mail::SpamAssassin::ArchiveIterator.3
-#usr/share/man/man3/Mail::SpamAssassin::AsyncLoop.3
-#usr/share/man/man3/Mail::SpamAssassin::AutoWhitelist.3
-#usr/share/man/man3/Mail::SpamAssassin::Bayes.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::BDB.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::MySQL.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::PgSQL.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::Redis.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::SQL.3
-#usr/share/man/man3/Mail::SpamAssassin::Client.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf::LDAP.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf::Parser.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf::SQL.3
-#usr/share/man/man3/Mail::SpamAssassin::DnsResolver.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger::File.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger::Stderr.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger::Syslog.3
-#usr/share/man/man3/Mail::SpamAssassin::Message.3
-#usr/share/man/man3/Mail::SpamAssassin::Message::Metadata.3
-#usr/share/man/man3/Mail::SpamAssassin::Message::Node.3
-#usr/share/man/man3/Mail::SpamAssassin::PerMsgLearner.3
-#usr/share/man/man3/Mail::SpamAssassin::PerMsgStatus.3
-#usr/share/man/man3/Mail::SpamAssassin::PersistentAddrList.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::ASN.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AWL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AccessDB.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AntiVirus.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AskDNS.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Bayes.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Check.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DCC.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DKIM.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DNSEval.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::FromNameSpoof.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::HashBL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Hashcash.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::MIMEEval.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::MIMEHeader.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::PDFInfo.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::PhishTag.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Phishing.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Pyzor.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Razor2.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::RelayCountry.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::ReplaceTags.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::ResourceLimits.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Reuse.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Rule2XSBody.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::SPF.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Shortcircuit.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::SpamCop.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Test.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::TextCat.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::TxRep.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::URIDNSBL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::URIDetail.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::URILocalBL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::VBounce.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::WhiteListSubject.3
-#usr/share/man/man3/Mail::SpamAssassin::PluginHandler.3
-#usr/share/man/man3/Mail::SpamAssassin::RegistryBoundaries.3
-#usr/share/man/man3/Mail::SpamAssassin::SQLBasedAddrList.3
-#usr/share/man/man3/Mail::SpamAssassin::SubProcBackChannel.3
-#usr/share/man/man3/Mail::SpamAssassin::Timeout.3
-#usr/share/man/man3/Mail::SpamAssassin::Util.3
-#usr/share/man/man3/Mail::SpamAssassin::Util::DependencyInfo.3
-#usr/share/man/man3/Mail::SpamAssassin::Util::Progress.3
-#usr/share/man/man3/spamassassin-run.3
-usr/share/spamassassin
-#usr/share/spamassassin/languages
-#usr/share/spamassassin/sa-update-pubkey.txt
-#usr/share/spamassassin/user_prefs.template
diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission
index fbf1ad191..d831ecde9 100644
--- a/config/rootfiles/packages/transmission
+++ b/config/rootfiles/packages/transmission
@@ -31,7 +31,9 @@ usr/share/transmission
 #usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js
 #usr/share/transmission/web/javascript/jquery/jquery.ui-contextmenu.min.js
 #usr/share/transmission/web/javascript/jquery/json2.min.js
+#usr/share/transmission/web/javascript/main.js
 #usr/share/transmission/web/javascript/notifications.js
+#usr/share/transmission/web/javascript/polyfill.js
 #usr/share/transmission/web/javascript/prefs-dialog.js
 #usr/share/transmission/web/javascript/remote.js
 #usr/share/transmission/web/javascript/torrent-row.js
diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
index 8355a4614..ffbe46078 100644
--- a/config/rootfiles/packages/vdr_eepg
+++ b/config/rootfiles/packages/vdr_eepg
@@ -1,2 +1,2 @@
 etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.4.1
+usr/lib/vdr/libvdr-eepg.so.2.4.4
diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 2402626dd..30f7e088b 100644
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
 etc/vdr/plugins/epgsearch
 etc/vdr/plugins/epgsearch/conf.d
 usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1
-usr/lib/vdr/libvdr-epgsearch.so.2.4.1
-usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1
-usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.4
+usr/lib/vdr/libvdr-epgsearch.so.2.4.4
+usr/lib/vdr/libvdr-epgsearchonly.so.2.4.4
+usr/lib/vdr/libvdr-quickepgsearch.so.2.4.4
 #var/lib/vdr
 #var/lib/vdr/data
 var/lib/vdr/data/epgsearch
diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev
index bd17db85c..6bc36f6d2 100644
--- a/config/rootfiles/packages/vdr_streamdev
+++ b/config/rootfiles/packages/vdr_streamdev
@@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server
 etc/vdr/plugins/streamdev-server/streamdevhosts.conf
 #usr/lib/vdr/bin
 usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.4.1
+usr/lib/vdr/libvdr-streamdev-server.so.2.4.4
diff --git a/config/rootfiles/packages/x86_64/amazon-ssm-agent b/config/rootfiles/packages/x86_64/amazon-ssm-agent
index 98f93cdfd..e49195394 100644
--- a/config/rootfiles/packages/x86_64/amazon-ssm-agent
+++ b/config/rootfiles/packages/x86_64/amazon-ssm-agent
@@ -4,6 +4,7 @@ etc/amazon/ssm/amazon-ssm-agent.json
 etc/amazon/ssm/seelog.xml
 etc/rc.d/init.d/amazon-ssm-agent
 usr/bin/amazon-ssm-agent
+usr/bin/ssm-agent-worker
 usr/bin/ssm-cli
 usr/bin/ssm-document-worker
 usr/bin/ssm-session-logger
diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi
index 2dd21fe99..40e2e15ff 100644
--- a/config/rootfiles/packages/x86_64/vdr_dvbapi
+++ b/config/rootfiles/packages/x86_64/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
diff --git a/config/suricata/ruleset-sources b/config/suricata/ruleset-sources
index 8b25346b5..a00cef945 100644
--- a/config/suricata/ruleset-sources
+++ b/config/suricata/ruleset-sources
@@ -1,8 +1,8 @@
 # Ruleset for registered sourcefire users.
-registered = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode>
+registered = https://www.snort.org/rules/snortrules-snapshot-29161.tar.gz?oinkcode=<oinkcode>
# Ruleset for registered sourcefire users with valid subscription.
-subscripted = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode>
+subscripted = https://www.snort.org/rules/snortrules-snapshot-29161.tar.gz?oinkcode=<oinkcode>
# Community rules from sourcefire.
 community = https://www.snort.org/rules/community
diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index 43f10c89d..4e9e39967 100644
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -271,14 +271,16 @@ outputs:
#- dnp3
         - ftp
-        #- rdp
+        - rdp
         - nfs
         - smb
         - tftp
         - ikev2
+        - dcerpc
         - krb5
         - snmp
-        #- sip
+        - rfb
+        - sip
         - dhcp:
             enabled: yes
             # When extended mode is on, all DHCP messages are logged
@@ -287,6 +289,12 @@ outputs:
             # to an IP address is logged.
             extended: no
         - ssh
+        - mqtt:
+            # passwords: yes           # enable output of passwords
+        # HTTP2 logging. HTTP2 support is currently experimental and
+        # disabled by default. To enable, uncomment the following line
+        # and be sure to enable http2 in the app-layer section.
+        #- http2
         - stats:
             totals: yes       # stats for all threads merged together
             threads: no       # per thread stats
@@ -358,6 +366,14 @@ nfq:
 # "detection-only" enables protocol detection only (parser disabled).
 app-layer:
   protocols:
+    rfb:
+      enabled: yes
+      detection-ports:
+        dp: 5900, 5901, 5902, 5903, 5904, 5905, 5906, 5907, 5908, 5909
+    # MQTT, disabled by default.
+    mqtt:
+      # enabled: no
+      # max-msg-length: 1mb
     krb5:
       enabled: yes
     snmp:
@@ -371,9 +387,7 @@ app-layer:
# Generate JA3 fingerprint from client hello. If not specified it
       # will be disabled by default, but enabled if rules require it.
-      #ja3-fingerprints: auto
-      # Generate JA3 fingerprint from client hello
-      ja3-fingerprints: no
+      ja3-fingerprints: auto
# Completely stop processing TLS/SSL session after the handshake
       # completed. If bypass is enabled this will also trigger flow
@@ -388,6 +402,10 @@ app-layer:
       enabled: yes
     ssh:
       enabled: yes
+      #hassh: yes
+    # HTTP2: Experimental HTTP 2 support. Disabled by default.
+    http2:
+      enabled: no
     smtp:
       enabled: yes
       # Configure SMTP-MIME Decoder
diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges
index 33d6d65ba..89470fec0 100644
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -81,15 +81,23 @@ MODE="$(get_value "${ZONE}_MODE")"
# The name of the virtual bridge
 BRIDGE="$(get_value "${ZONE}_DEV")"
+STP="$(get_value "${ZONE}_STP")"
+STP_PRIORITY="$(get_value "${ZONE}_STP_PRIORITY")"
case "${MODE}" in
    bridge)
+		# We need to check if $STP_PRIORITY has a valid value if not set it
+		if [ -n "${STP_PRIORITY}" ]; then
+			STP_PRIORITY=16384;
+		fi
+
    	ADDRESS="$(get_value "${ZONE}_MACADDR")"
    	[ -n "${ADDRESS}" ] || ADDRESS="$(random_mac_address)"
# We need to create the bridge if it doesn't exist, yet
    	if [ ! -d "/sys/class/net/${BRIDGE}" ]; then
-			ip link add "${BRIDGE}" address "${ADDRESS}" type bridge
+			ip link add "${BRIDGE}" address "${ADDRESS}" type bridge \
+				$([ "${STP}" = "on" ] && echo "stp_state 1  priority ${STP_PRIORITY}" )
    		#ip link set "${BRIDGE}" up
    	fi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 6fcafc460..6d22fcea4 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -235,8 +235,6 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
-WARNING: translation string unused: dns server
-WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -735,6 +733,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor exit country
+WARNING: translation string unused: tor guard country
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -888,3 +887,6 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: winbind daemon = Winbind Daemon
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
diff --git a/doc/language_issues.en b/doc/language_issues.en
index c0a618da6..b3c46de5e 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -324,12 +324,14 @@ WARNING: untranslated string: april = April
 WARNING: untranslated string: are you sure = Are you sure?
 WARNING: untranslated string: arp table entries = ARP Table Entries
 WARNING: untranslated string: artist = Artist
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: atm settings = ATM settings
 WARNING: untranslated string: attention = ATTENTION
 WARNING: untranslated string: august = August
 WARNING: untranslated string: authentication = Authentication:
 WARNING: untranslated string: automatic = Automatic
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: average = Average
 WARNING: untranslated string: back = Back
 WARNING: untranslated string: backup = Backup
@@ -596,11 +598,11 @@ WARNING: untranslated string: dl client arch = Download Client Package (zip)
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dmz = DMZ
 WARNING: untranslated string: dnat address = Firewall Interface
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check failed = DNS check failed
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -610,6 +612,7 @@ WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns proxy server = DNS Proxy Server
 WARNING: untranslated string: dns recursor mode = Recursor Mode
+WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns title = Domain Name System
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -1126,7 +1129,9 @@ WARNING: untranslated string: ip address outside subnets = IP Address outside su
 WARNING: untranslated string: ip alias added = External IP alias added
 WARNING: untranslated string: ip alias changed = External IP alias changed
 WARNING: untranslated string: ip alias removed = External IP alias removed
-WARNING: untranslated string: ip info = IP Information
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info = IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipfire has now rebooted = IPFire is rebooting now.
 WARNING: untranslated string: ipfire has now shutdown = IPFire is shutting down now.
 WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid.
@@ -1186,7 +1191,6 @@ WARNING: untranslated string: loged in at = Logged in at
 WARNING: untranslated string: logging server = Logging Server
 WARNING: untranslated string: loginlogout = Login/Logout
 WARNING: untranslated string: logs = logs
-WARNING: untranslated string: lookup failed = Reverse lookup failed
 WARNING: untranslated string: low = Low
 WARNING: untranslated string: mac address = MAC Address
 WARNING: untranslated string: mac address deleted = Successfully deleted!
@@ -1484,6 +1488,7 @@ WARNING: untranslated string: proxy reports monthly = Monthly reports
 WARNING: untranslated string: proxy reports today = Today
 WARNING: untranslated string: proxy reports weekly = Weekly reports
 WARNING: untranslated string: ptr = PTR
+WARNING: untranslated string: ptr lookup failed = Reverse lookup failed
 WARNING: untranslated string: pulse = Pulse
 WARNING: untranslated string: pulse dial = Pulse dial:
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
@@ -1711,6 +1716,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port
 WARNING: untranslated string: tor exit country any = Any country
 WARNING: untranslated string: tor exit nodes = Exit Nodes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
 WARNING: untranslated string: tor relay address = Relay address
 WARNING: untranslated string: tor relay configuration = Tor Relay Configuration
 WARNING: untranslated string: tor relay enabled = Enable Tor Relay
@@ -1729,7 +1736,8 @@ WARNING: untranslated string: tor stats = Statistics
 WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached.
 WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections.
 WARNING: untranslated string: tor traffic read written = Total traffic (read/written)
-WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line)
+WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line)
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: total connection time = Total Connection Time
 WARNING: untranslated string: total hits for log section = Total hits for log section
 WARNING: untranslated string: traffic on = Traffic on
@@ -2086,6 +2094,7 @@ WARNING: untranslated string: website = Website
 WARNING: untranslated string: wednesday = Wednesday
 WARNING: untranslated string: week = Week
 WARNING: untranslated string: weeks = Weeks
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless = Wireless
 WARNING: untranslated string: wireless config added = Wireless config added
@@ -2138,6 +2147,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP
 WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP
 WARNING: untranslated string: wlan clients = Wireless clients
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap channel = Channel
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 689eeca7c..9f62f03f2 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -821,8 +821,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: bit = bit
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
@@ -893,10 +895,10 @@ WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -905,6 +907,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns recursor mode = Recursor Mode
+WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1217,6 +1220,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1411,6 +1416,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port
 WARNING: untranslated string: tor exit country any = Any country
 WARNING: untranslated string: tor exit nodes = Exit Nodes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
 WARNING: untranslated string: tor relay address = Relay address
 WARNING: untranslated string: tor relay configuration = Tor Relay Configuration
 WARNING: untranslated string: tor relay enabled = Enable Tor Relay
@@ -1429,7 +1436,8 @@ WARNING: untranslated string: tor stats = Statistics
 WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached.
 WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections.
 WARNING: untranslated string: tor traffic read written = Total traffic (read/written)
-WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line)
+WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line)
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: twelve hours = 12 Hours
 WARNING: untranslated string: two weeks = Two Weeks
@@ -1465,6 +1473,7 @@ WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless network = WiFi Network
 WARNING: untranslated string: wlan client = Wireless client
@@ -1513,6 +1522,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP
 WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP
 WARNING: untranslated string: wlan clients = Wireless clients
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 632acf938..90a745360 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -262,8 +262,6 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
-WARNING: translation string unused: dns server
-WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -879,9 +877,9 @@ WARNING: translation string unused: zoneconf val ppp assignment error
 WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val zoneslave amount error
-WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: disable = Disable
-WARNING: untranslated string: enable = Enable
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
@@ -913,15 +911,13 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
-WARNING: untranslated string: optional = Optional
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: pakfire ago = ago.
-WARNING: untranslated string: required = Required
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
-WARNING: untranslated string: samba server role member = Domain Member
-WARNING: untranslated string: samba server role standalone = Standalone
-WARNING: untranslated string: smb daemon = SMB Daemon
-WARNING: untranslated string: user management = User Management
-WARNING: untranslated string: winbind daemon = Winbind Daemon
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
+WARNING: untranslated string: whois results from = WHOIS results from
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 99a7f3e8d..62e4f9953 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -236,8 +236,6 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
-WARNING: translation string unused: dns server
-WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnsforward forward_server
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
@@ -901,6 +899,8 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bytes = unknown string
@@ -919,10 +919,10 @@ WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -1050,6 +1050,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
 WARNING: untranslated string: ipsec interface mode none = - None (Default) -
@@ -1146,6 +1148,9 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
 WARNING: untranslated string: tcp more reliable = TCP (more reliable)
 WARNING: untranslated string: ten minutes = 10 Minutes
 WARNING: untranslated string: thirty minutes = 30 Minutes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: twelve hours = 12 Hours
 WARNING: untranslated string: two weeks = Two Weeks
@@ -1174,6 +1179,7 @@ WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless network = WiFi Network
 WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity
@@ -1191,6 +1197,9 @@ WARNING: untranslated string: wlan client password = Password
 WARNING: untranslated string: wlan client tls cipher = TLS Cipher
 WARNING: untranslated string: wlan client tls version = TLS Version
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 2afa7b0f3..9a767322e 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -234,7 +234,6 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
-WARNING: translation string unused: dns server
 WARNING: translation string unused: dnsforward forward_server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -893,7 +892,9 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bytes = unknown string
@@ -919,10 +920,10 @@ WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -1059,6 +1060,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
 WARNING: untranslated string: ipsec interface mode none = - None (Default) -
@@ -1184,6 +1187,9 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
 WARNING: untranslated string: tcp more reliable = TCP (more reliable)
 WARNING: untranslated string: ten minutes = 10 Minutes
 WARNING: untranslated string: thirty minutes = 30 Minutes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: twelve hours = 12 Hours
 WARNING: untranslated string: two weeks = Two Weeks
@@ -1214,6 +1220,7 @@ WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless network = WiFi Network
 WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity
@@ -1231,6 +1238,9 @@ WARNING: untranslated string: wlan client password = Password
 WARNING: untranslated string: wlan client tls cipher = TLS Cipher
 WARNING: untranslated string: wlan client tls version = TLS Version
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 689eeca7c..9f62f03f2 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -821,8 +821,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: bit = bit
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
@@ -893,10 +895,10 @@ WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -905,6 +907,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns recursor mode = Recursor Mode
+WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1217,6 +1220,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1411,6 +1416,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port
 WARNING: untranslated string: tor exit country any = Any country
 WARNING: untranslated string: tor exit nodes = Exit Nodes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
 WARNING: untranslated string: tor relay address = Relay address
 WARNING: untranslated string: tor relay configuration = Tor Relay Configuration
 WARNING: untranslated string: tor relay enabled = Enable Tor Relay
@@ -1429,7 +1436,8 @@ WARNING: untranslated string: tor stats = Statistics
 WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached.
 WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections.
 WARNING: untranslated string: tor traffic read written = Total traffic (read/written)
-WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line)
+WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line)
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: twelve hours = 12 Hours
 WARNING: untranslated string: two weeks = Two Weeks
@@ -1465,6 +1473,7 @@ WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless network = WiFi Network
 WARNING: untranslated string: wlan client = Wireless client
@@ -1513,6 +1522,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP
 WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP
 WARNING: untranslated string: wlan clients = Wireless clients
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index ac9715beb..5d16e0b18 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -225,7 +225,6 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
-WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
 WARNING: translation string unused: domain not set
@@ -823,8 +822,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: bit = bit
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
@@ -897,10 +898,10 @@ WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: disk access = Disk Access
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -1212,6 +1213,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1406,6 +1409,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port
 WARNING: untranslated string: tor exit country any = Any country
 WARNING: untranslated string: tor exit nodes = Exit Nodes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
 WARNING: untranslated string: tor relay address = Relay address
 WARNING: untranslated string: tor relay configuration = Tor Relay Configuration
 WARNING: untranslated string: tor relay enabled = Enable Tor Relay
@@ -1424,7 +1429,8 @@ WARNING: untranslated string: tor stats = Statistics
 WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached.
 WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections.
 WARNING: untranslated string: tor traffic read written = Total traffic (read/written)
-WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line)
+WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line)
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: twelve hours = 12 Hours
 WARNING: untranslated string: two weeks = Two Weeks
@@ -1460,6 +1466,7 @@ WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless network = WiFi Network
 WARNING: untranslated string: wlan client = Wireless client
@@ -1508,6 +1515,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP
 WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP
 WARNING: untranslated string: wlan clients = Wireless clients
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 7613e2ff7..26530a923 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -258,8 +258,6 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
-WARNING: translation string unused: dns server
-WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnsforward forward_server
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
@@ -886,6 +884,8 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
 WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: cpu frequency = CPU frequency
@@ -896,10 +896,10 @@ WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -983,6 +983,8 @@ WARNING: untranslated string: invalid input for interface mtu = Invalid input to
 WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
 WARNING: untranslated string: ipsec interface mode none = - None (Default) -
@@ -1045,6 +1047,9 @@ WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: subnet mask = Subnet Mask
 WARNING: untranslated string: system is offline = The system is offline.
 WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: update ruleset = Update ruleset
 WARNING: untranslated string: user management = User Management
@@ -1054,7 +1059,11 @@ WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeNam
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_missings b/doc/language_missings
index a1fcdc334..12e341402 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -61,6 +61,9 @@
 < user management
 < vpn configuration main
 < winbind daemon
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
@@ -94,9 +97,11 @@
 < age sminute
 < age ssecond
 < application layer gateways
+< asn lookup failed
 < Async logging enabled
 < atm device
 < attention
+< autonomous system
 < bit
 < block
 < broken
@@ -236,6 +241,7 @@
 < dns configuration
 < dns could not add server
 < dns enable safe-search
+< dns enable safe-search youtube
 < dnsforward
 < dnsforward add a new entry
 < dnsforward configuration
@@ -576,6 +582,8 @@
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
+< ip basic info
+< ip info for
 < ipsec
 < ipsec connection
 < ipsec interface mode gre
@@ -808,6 +816,9 @@
 < tor exit country
 < tor exit country any
 < tor exit nodes
+< tor guard country
+< tor guard country any
+< tor guard nodes
 < tor relay address
 < tor relay configuration
 < tor relay enabled
@@ -827,6 +838,7 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< tor use guard nodes
 < transport mode does not support vti
 < twelve hours
 < two weeks
@@ -866,9 +878,13 @@
 < vulnerability
 < vulnerable
 < Weekly
+< whois results from
 < winbind daemon
 < wireless network
 < wlanap
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 < wlanap auto
 < wlanap broadcast ssid
 < wlanap client isolation
@@ -942,22 +958,21 @@
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 < ansi t1.483
+< asn lookup failed
+< autonomous system
 < bewan adsl pci st
 < bewan adsl usb
-< desired
-< disable
-< enable
+< dns enable safe-search youtube
 < g.dtm
 < g.lite
-< netbios nameserver daemon
-< optional
-< required
-< samba server role member
-< samba server role standalone
-< smb daemon
+< ip basic info
+< ip info for
+< tor guard country
+< tor guard country any
+< tor guard nodes
+< tor use guard nodes
 < upload fcdsl.o
-< user management
-< winbind daemon
+< whois results from
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
@@ -979,6 +994,8 @@
 < advproxy wpad title
 < advproxy wpad view pac
 < application layer gateways
+< asn lookup failed
+< autonomous system
 < block
 < broken
 < Captive
@@ -1057,6 +1074,7 @@
 < dns configuration
 < dns could not add server
 < dns enable safe-search
+< dns enable safe-search youtube
 < dns forward disable dnssec
 < dnsforward dnssec disabled
 < dnsforward forward_servers
@@ -1158,6 +1176,8 @@
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
+< ip basic info
+< ip info for
 < ipsec connection
 < ipsec interface mode gre
 < ipsec interface mode none
@@ -1256,6 +1276,10 @@
 < tcp more reliable
 < ten minutes
 < thirty minutes
+< tor guard country
+< tor guard country any
+< tor guard nodes
+< tor use guard nodes
 < transport mode does not support vti
 < twelve hours
 < two weeks
@@ -1284,9 +1308,13 @@
 < vulnerability
 < vulnerable
 < Weekly
+< whois results from
 < winbind daemon
 < wireless network
 < wlanap
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 < wlanap auto
 < wlanap broadcast ssid
 < wlanap client isolation
@@ -1346,7 +1374,9 @@
 < advproxy wpad title
 < advproxy wpad view pac
 < application layer gateways
+< asn lookup failed
 < atm device
+< autonomous system
 < block
 < broken
 < capabilities
@@ -1433,6 +1463,7 @@
 < dns configuration
 < dns could not add server
 < dns enable safe-search
+< dns enable safe-search youtube
 < dns forward disable dnssec
 < dnsforward dnssec disabled
 < dnsforward forward_servers
@@ -1448,7 +1479,6 @@
 < dnssec information
 < dnssec not supported
 < dnssec validating
-< dns servers
 < dns tls hostname
 < dns use isp assigned nameservers
 < dns use protocol for dns queries
@@ -1546,6 +1576,8 @@
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
+< ip basic info
+< ip info for
 < ipsec connection
 < ipsec interface mode gre
 < ipsec interface mode none
@@ -1677,6 +1709,10 @@
 < ten minutes
 < teovpn_fragment
 < thirty minutes
+< tor guard country
+< tor guard country any
+< tor guard nodes
+< tor use guard nodes
 < transport mode does not support vti
 < twelve hours
 < two weeks
@@ -1707,9 +1743,13 @@
 < vulnerability
 < vulnerable
 < Weekly
+< whois results from
 < winbind daemon
 < wireless network
 < wlanap
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 < wlanap auto
 < wlanap broadcast ssid
 < wlanap client isolation
@@ -1780,8 +1820,10 @@
 < age sminute
 < age ssecond
 < application layer gateways
+< asn lookup failed
 < atm device
 < attention
+< autonomous system
 < bit
 < block
 < broken
@@ -1922,6 +1964,7 @@
 < dns configuration
 < dns could not add server
 < dns enable safe-search
+< dns enable safe-search youtube
 < dnsforward
 < dnsforward add a new entry
 < dnsforward configuration
@@ -1943,7 +1986,6 @@
 < dnssec information
 < dnssec not supported
 < dnssec validating
-< dns servers
 < dns tls hostname
 < dns use isp assigned nameservers
 < dns use protocol for dns queries
@@ -2254,6 +2296,8 @@
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
+< ip basic info
+< ip info for
 < ipsec
 < ipsec connection
 < ipsec interface mode gre
@@ -2480,6 +2524,9 @@
 < tor exit country
 < tor exit country any
 < tor exit nodes
+< tor guard country
+< tor guard country any
+< tor guard nodes
 < tor relay address
 < tor relay configuration
 < tor relay enabled
@@ -2499,6 +2546,7 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< tor use guard nodes
 < transport mode does not support vti
 < twelve hours
 < two weeks
@@ -2538,9 +2586,13 @@
 < vulnerability
 < vulnerable
 < Weekly
+< whois results from
 < winbind daemon
 < wireless network
 < wlanap
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 < wlanap auto
 < wlanap broadcast ssid
 < wlanap client isolation
@@ -2644,8 +2696,10 @@
 < age sminute
 < age ssecond
 < application layer gateways
+< asn lookup failed
 < atm device
 < attention
+< autonomous system
 < bit
 < block
 < broken
@@ -2788,6 +2842,7 @@
 < dns configuration
 < dns could not add server
 < dns enable safe-search
+< dns enable safe-search youtube
 < dnsforward
 < dnsforward add a new entry
 < dnsforward configuration
@@ -2809,7 +2864,6 @@
 < dnssec information
 < dnssec not supported
 < dnssec validating
-< dns servers
 < dns tls hostname
 < dns use isp assigned nameservers
 < dns use protocol for dns queries
@@ -3124,6 +3178,8 @@
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
+< ip basic info
+< ip info for
 < ipsec
 < ipsec connection
 < ipsec interface mode gre
@@ -3348,6 +3404,9 @@
 < tor exit country
 < tor exit country any
 < tor exit nodes
+< tor guard country
+< tor guard country any
+< tor guard nodes
 < tor relay address
 < tor relay configuration
 < tor relay enabled
@@ -3367,6 +3426,7 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< tor use guard nodes
 < transport mode does not support vti
 < twelve hours
 < two weeks
@@ -3407,9 +3467,13 @@
 < vulnerable
 < week-graph
 < Weekly
+< whois results from
 < winbind daemon
 < wireless network
 < wlanap
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 < wlanap auto
 < wlanap broadcast ssid
 < wlanap client isolation
@@ -3492,6 +3556,8 @@
 < advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
+< asn lookup failed
+< autonomous system
 < broken
 < Captive delete logo
 < cpu frequency
@@ -3509,6 +3575,7 @@
 < dns configuration
 < dns could not add server
 < dns enable safe-search
+< dns enable safe-search youtube
 < dns forward disable dnssec
 < dnsforward dnssec disabled
 < dnsforward forward_servers
@@ -3561,6 +3628,8 @@
 < invalid input for local ip address
 < invalid input for mode
 < invalid ip or hostname
+< ip basic info
+< ip info for
 < ipsec connection
 < ipsec interface mode gre
 < ipsec interface mode none
@@ -3620,6 +3689,10 @@
 < subnet mask
 < system is offline
 < taa zombieload2
+< tor guard country
+< tor guard country any
+< tor guard nodes
+< tor use guard nodes
 < transport mode does not support vti
 < update ruleset
 < user management
@@ -3629,7 +3702,11 @@
 < vulnerability
 < vulnerable
 < Weekly
+< whois results from
 < winbind daemon
+< wlanap 802.11w disabled
+< wlanap 802.11w enforced
+< wlanap 802.11w optional
 < wlanap auto
 < wlanap broadcast ssid
 < wlanap client isolation
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 6c55bd7a0..8613b9d9b 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -86,9 +86,6 @@ if ( $debug ){
 my @dummy = ( ${Header::table1colour} );
 undef (@dummy);
-# Init libloc database connection.
-my $libloc_db_handle = &Location::Functions::init();
-
 # check sorting arguments
 if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
    $SORT_FIELD = $cgiin{'sort_field'};
@@ -554,9 +551,9 @@ foreach my $line (@conntrack) {
    my $bytes_out = format_bytes($bytes[1]);
# enumerate location information
-	my $srcccode = &Location::Functions::lookup_country_code($libloc_db_handle, $sip_ret);
+	my $srcccode = &Location::Functions::lookup_country_code($sip_ret);
    my $src_flag_icon = &Location::Functions::get_flag_icon($srcccode);
-	my $dstccode = &Location::Functions::lookup_country_code($libloc_db_handle, $dip_ret);
+	my $dstccode = &Location::Functions::lookup_country_code($dip_ret);
    my $dst_flag_icon = &Location::Functions::get_flag_icon($dstccode);
# Format TTL
diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi
index b519d89b3..b1c72bb22 100644
--- a/html/cgi-bin/country.cgi
+++ b/html/cgi-bin/country.cgi
@@ -52,11 +52,8 @@ print<<END;
    </tr>
 END
-# Init libloc database connection.
-my $db_handle = &Location::Functions::init();
-
 # Get a list of all supported country codes.
-my @countries = &Location::database_countries($db_handle);
+my @countries = &Location::database_countries();
# Loop through whole country list.
 foreach my $country (@countries) {
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index fe46a0580..ef7609cfc 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -80,9 +80,9 @@ Daniel Weismüller,
 Heiner Schmeling,
 Stephan Feddersen,
 Timo Eissler,
+Stéphane Pautrel,
 Jan Lentfer,
 Marcus Scholz,
-Stéphane Pautrel,
 Ersan Yildirim,
 Jörn-Ingo Weigert,
 Adolf Belka,
@@ -100,6 +100,7 @@ Michael Eitelwein,
 Alex Koch,
 Dominik Hassler,
 Larsen,
+Ramax Lo,
 Gabriel Rolland,
 Marcel Follert,
 Tim FitzGeorge,
@@ -111,7 +112,6 @@ Jakub Ratajczak,
 Jorrit de Jonge,
 Leo-Andres Hofmann,
 Przemek Zdroik,
-Ramax Lo,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 0a097e2c0..337166ccf 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -87,6 +87,10 @@ if ($cgiparams{'GENERAL'} eq $Lang::tr{'save'}) {
    	$cgiparams{'ENABLE_SAFE_SEARCH'} = "off";
    }
+	if ($cgiparams{'ENABLE_SAFE_SEARCH_YOUTUBE'} ne "on") {
+		$cgiparams{'ENABLE_SAFE_SEARCH_YOUTUBE'} = "off";
+	}
+
    # Check if using ISP nameservers and TLS is enabled at the same time.
    if (($cgiparams{'USE_ISP_NAMESERVERS'} eq "on") && ($cgiparams{'PROTO'} eq "TLS")) {
    	$errormessage = $Lang::tr{'dns isp nameservers and tls not allowed'}
@@ -259,6 +263,7 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($cgiparams{'SERVERS'} eq $L
# Hash to store the generic DNS settings.
 my %settings = ();
+$settings{"ENABLE_SAFE_SEARCH_YOUTUBE"} = "on";
# Read-in general DNS settings.
 &General::readhash("$settings_file", %settings);
@@ -269,10 +274,7 @@ my %dns_servers = ();
 # Read-in config file.
 &General::readhasharray("$servers_file", %dns_servers);
-# Libloc database handle
-my $libloc_db_handle = &Location::Functions::init();
-
-&Header::openpage($Lang::tr{'dns'}, 1, '');
+&Header::openpage($Lang::tr{'dns title'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -313,6 +315,10 @@ $checked{'ENABLE_SAFE_SEARCH'}{'off'} = '';
 $checked{'ENABLE_SAFE_SEARCH'}{'on'} = '';
 $checked{'ENABLE_SAFE_SEARCH'}{$settings{'ENABLE_SAFE_SEARCH'}} = "checked='checked'";
+$checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{'off'} = '';
+$checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{'on'} = '';
+$checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{$settings{'ENABLE_SAFE_SEARCH_YOUTUBE'}} = "checked='checked'";
+
 $selected{'PROTO'}{'UDP'} = '';
 $selected{'PROTO'}{'TLS'} = '';
 $selected{'PROTO'}{'TCP'} = '';
@@ -384,6 +390,16 @@ sub show_general_dns_configuration () {
    			</td>
    		</tr>
+			<tr>
+				<td width="33%">
+					&raquo; $Lang::tr{'dns enable safe-search youtube'}
+				</td>
+
+				<td>
+					<input type="checkbox" name="ENABLE_SAFE_SEARCH_YOUTUBE" $checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{'on'}>
+				</td>
+			</tr>
+
    		<tr>
    			<td colspan="2">
    				<br>
@@ -419,7 +435,7 @@ END
 # Section to display the configured and used DNS servers.
 #
 sub show_nameservers () {
-	&Header::openbox('100%', 'center', "$Lang::tr{'dns title'}");
+	&Header::openbox('100%', 'center', "$Lang::tr{'dns servers'}");
# Determine if we are running in recursor mode
    my $recursor = 0;
@@ -598,7 +614,7 @@ END
    			}
# collect more information about name server (rDNS, country code)
-				my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $nameserver);
+				my $ccode = &Location::Functions::lookup_country_code($nameserver);
    			my $flag_icon = &Location::Functions::get_flag_icon($ccode);
my $rdns;
@@ -609,7 +625,7 @@ END
    				$rdns = gethostbyaddr($iaddr, AF_INET);
    			}
-				if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }
+				if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; }
# Mark ISP name servers as disabled
    			if ($id <= 2 && $enabled eq "disabled") {
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 5aec4c594..fdf62361d 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -457,6 +457,7 @@ END
    					if (($line =~ /"$vpnconfig{$key}[1]".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]{.*INSTALLED/ )){
    						$activecolor = $Header::colourgreen;
    						$activestatus = $Lang::tr{'capsopen'};
+							last;
    					} elsif ($line =~ /$vpnconfig{$key}[1][.*CONNECTING/) {
    						$activecolor = $Header::colourorange;
    						$activestatus = $Lang::tr{'vpn connecting'};
diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index d8cb6c6b7..31b4a16d4 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  info@ipfire.org                          #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,12 +32,16 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "${General::swroot}/location-functions.pl";
+# Load colours for current theme...
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", %mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color);
+
 my %cgiparams=();
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'ip info'}, 1, '');
-&Header::openbigbox('100%', 'left');
 my @lines=();
 my $extraquery='';
@@ -57,17 +61,36 @@ my $whois_server = "whois.arin.net";
 my $addr = CGI::param("ip") || "";
if (&General::validip($addr)) {
+	# Write HTML page header...
+	&Header::openpage($Lang::tr{'ip info for'} . ' ' . $addr, 1, '');
+	&Header::openbigbox('100%', 'left');
+
    my $iaddr = inet_aton($addr);
    my $hostname = gethostbyaddr($iaddr, AF_INET);
-	if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; }
+	if (!$hostname) { $hostname = $Lang::tr{'ptr lookup failed'}; }
-	# enumerate location information for IP address...
-	my $db_handle = &Location::Functions::init();
-	my $ccode = &Location::Functions::lookup_country_code($db_handle, $addr);
+	# Enumerate location information for IP address...
+	my $ccode = &Location::Functions::lookup_country_code($addr);
+	my $cname = &Location::Functions::get_full_country_name($ccode);
    my @network_flags = &Location::Functions::address_has_flags($addr);
# Try to get the continent of the country code.
-	my $continent = &Location::get_continent_code($db_handle, $ccode);
+	my $continent = &Location::Functions::get_continent_code($ccode);
+
+	# Enumerate Autonomous System details for IP address...
+	my $asn = &Location::Functions::lookup_asn($addr);
+	my $as_name;
+	if ($asn) {
+		$as_name = &Location::Functions::get_as_name($asn);
+
+		# In case we have found an AS name, make output more readable...
+		if ($as_name) {
+			$as_name = "- " . $as_name;
+		}
+		$asn = "AS" . $asn;
+	} else {
+		$asn = $Lang::tr{'asn lookup failed'};
+	}
# Check if a whois server for the continent is known.
    if($whois_servers_by_continent{$continent}) {
@@ -77,6 +100,62 @@ if (&General::validip($addr)) {
my $flag_icon = &Location::Functions::get_flag_icon($ccode);
+	&Header::openbox('100%', 'left', $Lang::tr{'ip basic info'});
+
+	print <<END;
+		<center>
+			<table class="tbl" width='100%'>
+				<tr>
+					<td bgcolor='$color{'color22'}'><strong>$Lang::tr{'country'}</strong></td>
+					<td bgcolor='$color{'color22'}'>$cname <a href='country.cgi#$ccode'><img src="$flag_icon" border="0" align="absmiddle" alt="$cname" title="$cname" /></td>
+				</tr>
+				<tr>
+					<td bgcolor='$color{'color20'}'><strong>$Lang::tr{'ptr'}</strong></td>
+					<td bgcolor='$color{'color20'}'>$hostname</td>
+				</tr>
+				<tr>
+					<td bgcolor='$color{'color22'}'><strong>$Lang::tr{'autonomous system'}</strong></td>
+					<td bgcolor='$color{'color22'}'>$asn $as_name</td>
+				</tr>
+END
+
+	# Check if the address has a flag.
+	if (@network_flags) {
+		# Get amount of flags for this network.
+		my $flags_amount = @network_flags;
+		my $processed_flags;
+
+		# Loop through the array of network_flags.
+		foreach my $network_flag (@network_flags) {
+			# Increment value of processed flags.
+			$processed_flags++;
+
+			# Get the network flag name.
+			my $network_flag_name = &Location::Functions::get_full_country_name($network_flag);
+
+			# Colorize columns.
+			my $col;
+			if ($processed_flags % 2) {
+				$col = "bgcolor='$color{'color20'}'"; }
+			else {
+				$col = "bgcolor='$color{'color22'}'";
+			}
+
+			# Write table row...
+			print <<END;
+				<tr>
+					<td $col><strong>$network_flag_name</strong></td>
+					<td $col>$Lang::tr{'yes'}</td>
+				</tr>
+END
+		}
+	}
+
+	print "			</table>\n";
+	print "		</center>\n";
+
+	&Header::closebox();
+
    my $sock = new IO::Socket::INET ( PeerAddr => $whois_server, PeerPort => 43, Proto => 'tcp');
    if ($sock)
    {
@@ -108,53 +187,7 @@ if (&General::validip($addr)) {
    	@lines = ( "$Lang::tr{'unable to contact'} $whois_server" );
    }
-	&Header::openbox('100%', 'left', $addr . " <a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a> (" . $hostname . ') : '.$whois_server);
-
-	# Check if the address has a flag.
-	if (@network_flags) {
-		# Get amount of flags for this network.
-		my $flags_amount = @network_flags;
-		my $processed_flags;
-
-		# The message string which will be displayed.
-		my $message_string = "This address is marked as";
-
-		# Loop through the array of network_flags.
-		foreach my $network_flag (@network_flags) {
-			# Increment value of processed flags.
-			$processed_flags++;
-
-			# Get the network flag name.
-			my $network_flag_name = &Location::Functions::get_full_country_name($network_flag);
-
-			# Add the flag name to the message string.
-			$message_string = "$message_string" . " $network_flag_name";
-
-			# Check if multiple flags are set for this network.
-			if ($flags_amount gt "1") {
-				# Check if the the current flag is the next-to-last one.
-				if ($processed_flags eq $flags_amount - 1) {
-					$message_string = "$message_string" . " and ";
-
-				# Check if the current flag it the last one.
-				} elsif ($processed_flags eq $flags_amount) {
-					# The message is finished add a dot for ending the sentence.
-					$message_string = "$message_string" . ".";
-
-				# Otherwise add a simple comma to the message string.
-				} else {
-					$message_string = "$message_string" . ", ";
-				}
-			} else {
-				# Nothing special to do, simple add a dot to finish the sentence.
-				$message_string = "$message_string" . ".";
-			}
-		}
-
-		# Display the generated notice.
-		print "<h3>$message_string</h3>\n";
-		print "<br>\n";
-	}
+	&Header::openbox('100%', 'left', $Lang::tr{'whois results from'} . " " . $whois_server);
print "<pre>\n";
    foreach my $line (@lines) {
@@ -163,6 +196,10 @@ if (&General::validip($addr)) {
    print "</pre>\n";
    &Header::closebox();
 } else {
+	# Open HTML page header in case of invalid IP addresses
+	&Header::openpage($Lang::tr{'ip info'}, 1, '');
+	&Header::openbigbox('100%', 'left');
+
    &Header::openbox('100%', 'left', $Lang::tr{'invalid ip'});
    print <<EOF;
    	<p style="text-align: center;">
diff --git a/html/cgi-bin/location-block.cgi b/html/cgi-bin/location-block.cgi
index 3bc3a1e76..5bd70dfb5 100644
--- a/html/cgi-bin/location-block.cgi
+++ b/html/cgi-bin/location-block.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014 - 2020 IPFire Developemnt Team info@ipfire.org         #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -103,7 +103,7 @@ print"<form method='POST' action='$ENV{'SCRIPT_NAME'}'>\n";
 print <<END;
    <table width='95%'>
    	<tr>
-			<td width='25%' class='base'>$Lang::tr{'locationblock enable feature'}
+			<td width='50%' class='base'>$Lang::tr{'locationblock enable feature'}
    		<td><input type='checkbox' name='LOCATIONBLOCK_ENABLED' $checked></td>
    	</tr>
    	<tr>
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 2b690e35b..361bf0432 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -24,9 +24,6 @@ require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-# Libloc database handle.
-my $libloc_db_handle = &Location::Functions::init();
-
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", %mainsettings);
@@ -354,7 +351,8 @@ foreach $_ (@log)
    $srcport=$1 if $packet =~ /SPT=(\d+)/;
    $dstport=$1 if $packet =~ /DPT=(\d+)/;
-	my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr);
+	# Get the country code.
+	my $ccode = &Location::Functions::lookup_country_code($srcaddr);
my $servi = uc(getservbyport($srcport, lc($proto)));
    if ($servi ne '' && $srcport < 1024) {
diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index 701abab2c..e3901b945 100644
--- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
@@ -22,9 +22,6 @@ require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-# Libloc database handle.
-my $libloc_db_handle = &Location::Functions::init();
-
 use POSIX();
my %cgiparams=();
@@ -311,7 +308,7 @@ foreach $_ (@log)
    	# Traffic from red
    	if($srcaddr ne '') {
    		# srcaddr is set
-			my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr);
+			my $ccode = &Location::Functions::lookup_country_code($srcaddr);
    		if ($ccode eq '') {
    			$ccode = 'unknown';
    		}
diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index 670d72a52..6de4081af 100644
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -22,9 +22,6 @@ require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-# Libloc database handle.
-my $libloc_db_handle = &Location::Functions::init();
-
 use POSIX();
my %cgiparams=();
@@ -438,7 +435,8 @@ for($s=0;$s<$lines;$s++)
    $col="bgcolor='$color{"color$colorIndex"}'";
    print "<tr>";
-	my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $key[$s]);
+	# Get country code.
+	my $ccode = &Location::Functions::lookup_country_code($key[$s]);
$color++;
    print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index 4d80e77a4..2a246ec60 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -19,9 +19,6 @@ require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-# Libloc database handle.
-my $libloc_db_handle = &Location::Functions::init();
-
 use POSIX();
#workaround to suppress a warning when a variable is used only once
@@ -181,7 +178,7 @@ if (!$skip)
    		}
    		elsif($srcaddr ne '') {
    			# or srcaddr matches country code
-				my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr);
+				my $ccode = &Location::Functions::lookup_country_code($srcaddr);
    			if($ccode eq uc($country)){
    				$log[$lines] = $_;
    				$lines++;
@@ -352,7 +349,7 @@ foreach $_ (@slice)
    if($iface eq $country || $srcaddr ne '') {
    	my $ccode='';
    	if($iface ne $country) {
-			$ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr);
+			$ccode = &Location::Functions::lookup_country_code($srcaddr);
    	}
    	if($iface eq $country || $ccode eq uc($country)) {
    		my $chain = '';
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index e7bc505e7..68a70d147 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -280,14 +280,7 @@ sub writeserverconf {
     print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n";
     #print CONF "push "route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}"\n";
-    # Check if we are using mssfix, fragment and set the corretct mtu of 1500.
-    # If we doesn't use one of them, we can use the configured mtu value.
-    if ($sovpnsettings{'MSSFIX'} eq 'on') 
-	{ print CONF "tun-mtu 1500\n"; }
-    elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') 
-	{ print CONF "tun-mtu 1500\n"; }
-    else 
-	{ print CONF "tun-mtu $sovpnsettings{'DMTU'}\n"; }
+    print CONF "tun-mtu $sovpnsettings{'DMTU'}\n";
if ($vpnsettings{'ROUTES_PUSH'} ne '') {
    	@temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'});
@@ -320,6 +313,8 @@ sub writeserverconf {
     }
     if ($sovpnsettings{MSSFIX} eq 'on') {
    	print CONF "mssfix\n";
+    } else {
+		print CONF "mssfix 0\n";
     }
     if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
    	print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
@@ -975,7 +970,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}};
   print SERVERCONF "tun-mtu $tunmtu\n";
   if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} 
-  if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; 
+  if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; } else { print SERVERCONF "mssfix 0\n" };
   }
print SERVERCONF "# Auth. Server\n"; 
@@ -1074,7 +1069,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}};
   print CLIENTCONF "tun-mtu $tunmtu\n";
   if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";}
-  if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; 
+  if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; } else { print CLIENTCONF "mssfix 0\n" };
   }
# Check host certificate if X509 is RFC3280 compliant.
@@ -2204,7 +2199,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
    if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]};
    print CLIENTCONF "tun-mtu $tunmtu\n";
    if ($confighash{$cgiparams{'KEY'}}[24] ne '') {print CLIENTCONF "fragment $confighash{$cgiparams{'KEY'}}[24]\n";}
-   if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";}
+   if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";} else { print CLIENTCONF "mssfix 0\n"; }
    }
    # Check host certificate if X509 is RFC3280 compliant.
    # If not, old --ns-cert-type directive will be used.
@@ -2285,15 +2280,7 @@ else
     print CLIENTCONF "nobind\r\n";
     print CLIENTCONF "dev tun\r\n";
     print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n";
-
-    # Check if we are using fragment, mssfix and set MTU to 1500
-    # or use configured value.
-    if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' )
-	{ print CLIENTCONF "tun-mtu 1500\r\n"; }
-    elsif ($vpnsettings{MSSFIX} eq 'on')
-	{ print CLIENTCONF "tun-mtu 1500\r\n"; }
-    else
-	{ print CLIENTCONF "tun-mtu $vpnsettings{'DMTU'}\r\n"; }
+    print CLIENTCONF "tun-mtu $vpnsettings{'DMTU'}\r\n";
if ( $vpnsettings{'ENABLED'} eq 'on'){
     	print CLIENTCONF "remote $vpnsettings{'VPN_IP'} $vpnsettings{'DDEST_PORT'}\r\n";
@@ -2383,6 +2370,8 @@ else
     print CLIENTCONF "verify-x509-name $vpnsettings{ROOTCERT_HOSTNAME} name\r\n";
     if ($vpnsettings{MSSFIX} eq 'on') {
    print CLIENTCONF "mssfix\r\n";
+    } else {
+	print CLIENTCONF "mssfix 0\r\n";
     }
     if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' ) {
    print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n";
@@ -3002,9 +2991,6 @@ END
    &Header::openbigbox('100%', 'LEFT', '', '');
     &Header::openbox('100%', 'LEFT', $Lang::tr{'ovpn con stat'});
-    # Libloc database handle.
-    my $libloc_db_handle = &Location::Functions::init();
-
 #
 #	<td><b>$Lang::tr{'protocol'}</b></td>
 # protocol temp removed 
@@ -3055,7 +3041,7 @@ END
    	    $users[$uid]{'Proto'} = $proto;
# get country code for "RealAddress"...
-		    my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, (split ':', $users[$uid]{'RealAddress'})[0]);
+		    my $ccode = &Location::Functions::lookup_country_code((split ':', $users[$uid]{'RealAddress'})[0]);
    	    my $flag_icon = &Location::Functions::get_flag_icon($ccode);
    	    $users[$uid]{'Country'} = "<a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a>";
    	    $uid++;
diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 9c742669b..31e4f4085 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -277,10 +277,6 @@ sub printactivelogins()
    	print "<tr bgcolor='$table_colour'><td colspan='5'>$Lang::tr{'ssh no active logins'}</td></tr>\n";
    } else {
    	# list active logins...
-
-		# Libloc database handle.
-		my $libloc_db_handle = &Location::Functions::init();
-
    	foreach my $line (@output)
    	{
    		my @arry = split(/\ +/, $line);
@@ -291,13 +287,13 @@ sub printactivelogins()
    		$remoteip =~ s/[()]//g;
# display more information about that IP adress...
-			my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $remoteip);
+			my $ccode = &Location::Functions::lookup_country_code($remoteip);
    		my $flag_icon = &Location::Functions::get_flag_icon($ccode);
# get rDNS...
    		my $iaddr = inet_aton($remoteip);
    		my $rdns = gethostbyaddr($iaddr, AF_INET);
-			if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; };
+			if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; };
my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 7447bd791..ea340b612 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,9 +30,6 @@ require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-# Init libloc database connection.
-my $db_handle = &Location::Functions::init();
-
 #workaround to suppress a warning when a variable is used only once
 my @dummy = ( ${Header::colouryellow} );
 undef (@dummy);
@@ -99,6 +96,8 @@ $settings{'TOR_ENABLED'} = 'off';
 $settings{'TOR_SOCKS_PORT'} = 9050;
 $settings{'TOR_EXIT_COUNTRY'} = '';
 $settings{'TOR_USE_EXIT_NODES'} = '';
+$settings{'TOR_GUARD_COUNTRY'} = '';
+$settings{'TOR_USE_GUARD_NODES'} = '';
 $settings{'TOR_ALLOWED_SUBNETS'} = "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
 if (&Header::blue_used()) {
    $settings{'TOR_ALLOWED_SUBNETS'} .= ",$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
@@ -181,6 +180,15 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
    	}
    }
+	@temp = split(/[\n,]/,$settings{'TOR_USE_GUARD_NODES'});
+	$settings{'TOR_USE_GUARD_NODES'} = "";
+	foreach (@temp) {
+		s/^\s+//g; s/\s+$//g;
+		if ($_) {
+			$settings{'TOR_USE_GUARD_NODES'} .= $_.",";
+		}
+	}
+
    # Burst bandwidth must be less or equal to bandwidth rate.
    if ($settings{'TOR_RELAY_BANDWIDTH_RATE'} == 0) {
    	$settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
@@ -284,6 +292,9 @@ END
    @temp = split(",", $settings{'TOR_USE_EXIT_NODES'});
    $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
+	@temp = split(",", $settings{'TOR_USE_GUARD_NODES'});
+	$settings{'TOR_USE_GUARD_NODES'} = join("\n", @temp);
+
    print <<END;
    	<br>
    	<br>
@@ -306,8 +317,57 @@ END
    		</tr>
    	</table>
-		<br>
-		<br>
+		<br />
+		<br />
+
+		<table width='95%'>
+			<tr>
+				<td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor guard nodes'}</b></td>
+			</tr>
+			<tr>
+				<td colspan='2' class='base' width='55%'></td>
+				<td colspan='2' class='base' width='45%'>$Lang::tr{'tor use guard nodes'}:</td>
+			</tr>
+			<tr>
+				<td width='50%' colspan='2'>
+					<select name='TOR_GUARD_COUNTRY' multiple='multiple'>
+						<option value=''>- $Lang::tr{'tor guard country any'} -</option>
+END
+
+		# Convert Guard country strings into lists to make comparison easier
+		my @guard_countries;
+		if ($settings{'TOR_GUARD_COUNTRY'} ne '') {
+			@guard_countries = split(/|/, $settings{'TOR_GUARD_COUNTRY'});
+		}
+
+		my @country_codes = &Location::Functions::get_locations("no_special_locations");
+		foreach my $country_code (@country_codes) {
+			# Convert country code into upper case format.
+			$country_code = uc($country_code);
+
+			# Get country name.
+			my $country_name = &Location::Functions::get_full_country_name($country_code);
+
+			print "<option value='$country_code'";
+
+			if ($settings{'TOR_GUARD_COUNTRY'} ne '') {
+				print " selected" if grep /$country_code/, @guard_countries;
+			}
+
+			print ">$country_name ($country_code)</option>\n";
+		}
+
+	print <<END;
+					</select>
+				</td>
+				<td width='50%' colspan='2'>
+					<textarea name='TOR_USE_GUARD_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_GUARD_NODES'}</textarea>
+				</td>
+			</tr>
+		</table>
+
+		<br />
+		<br />
<table width='95%'>
    		<tr>
@@ -319,10 +379,17 @@ END
    		</tr>
    		<tr>
    			<td width='50%' colspan='2'>
-					<select name='TOR_EXIT_COUNTRY'>
+					<select name='TOR_EXIT_COUNTRY' multiple='multiple'>
    					<option value=''>- $Lang::tr{'tor exit country any'} -</option>
 END
-		my @country_codes = &Location::database_countries($db_handle);
+		my @country_codes = &Location::Functions::get_locations("no_special_locations");
+
+		# Convert Exit country strings into lists to make comparison easier
+		my @exit_countries;
+		if ($settings{'TOR_EXIT_COUNTRY'} ne '') {
+			@exit_countries = split(/|/, $settings{'TOR_EXIT_COUNTRY'});
+		}
+
    	foreach my $country_code (@country_codes) {
    		# Convert country code into upper case format.
    		$country_code = uc($country_code);
@@ -332,8 +399,8 @@ END
print "<option value='$country_code'";
-			if ($settings{'TOR_EXIT_COUNTRY'} eq $country_code) {
-				print " selected";
+			if ($settings{'TOR_EXIT_COUNTRY'} ne '') {
+				print " selected" if grep /$country_code/, @exit_countries;
    		}
print ">$country_name ($country_code)</option>\n";
@@ -676,10 +743,43 @@ sub BuildConfiguration() {
    	}
    	print FILE "SocksPolicy reject *\n" if (@subnets);
+		if ($settings{'TOR_GUARD_COUNTRY'} ne '') {
+			$strict_nodes = 1;
+			my $countrylist;
+
+			for my $singlecountry (split(/|/, $settings{'TOR_GUARD_COUNTRY'})) {
+				if ($countrylist eq '') {
+					$countrylist = "{" . lc $singlecountry . "}";
+				} else {
+					$countrylist = $countrylist . "," . "{" . lc $singlecountry . "}";
+				}
+			}
+
+			print FILE "EntryNodes $countrylist\n";
+		}
+
+		if ($settings{'TOR_USE_GUARD_NODES'} ne '') {
+			$strict_nodes = 1;
+
+			my @nodes = split(",", $settings{'TOR_USE_GUARD_NODES'});
+			foreach (@nodes) {
+				print FILE "EntryNode $_\n";
+			}
+		}
+
    	if ($settings{'TOR_EXIT_COUNTRY'} ne '') {
    		$strict_nodes = 1;
+			my $countrylist;
+
+			for my $singlecountry (split(/|/, $settings{'TOR_EXIT_COUNTRY'})) {
+				if ($countrylist eq '') {
+					$countrylist = "{" . lc $singlecountry . "}";
+				} else {
+					$countrylist = $countrylist . "," . "{" . lc $singlecountry . "}";
+				}
+			}
-			print FILE "ExitNodes {$settings{'TOR_EXIT_COUNTRY'}}\n";
+			print FILE "ExitNodes $countrylist\n";
    	}
if ($settings{'TOR_USE_EXIT_NODES'} ne '') {
@@ -912,7 +1012,7 @@ sub TorNodeDescription() {
    		$node->{'address'} = $3;
    		$node->{'port'}    = $4;
-			my $country_code = &TorGetInfo($tor, "ip-to-country/$node->{'address'}");
+			my $country_code = &Location::Functions::lookup_country_code($node->{'address'});
    		$node->{'country_code'} = $country_code;
# Flags
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index ae5e80d38..db442e111 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3019,6 +3019,7 @@ END
    	($line =~ /$confighash{$key}[1]{.*INSTALLED/)) {
    		$col1="bgcolor='${Header::colourgreen}'";
    		$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+			last;
    	} elsif ($line =~ /$confighash{$key}[1][.*CONNECTING/) {
    		$col1="bgcolor='${Header::colourorange}'";
    		$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn connecting'}</font></b>";
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 2c28d50e5..fd7e9a679 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -130,7 +130,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
    # verify WPA Passphrase - only with enabled enc
-	if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+	if ($wlanapsettings{'ENC'} ne "none") {
    	# must be 8 .. 63 characters
    	if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
    		$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
@@ -258,9 +258,10 @@ $checked{'CLIENTISOLATION'}{'off'} = '';
 $checked{'CLIENTISOLATION'}{'on'} = '';
 $checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'";
-$checked{'IEEE80211W'}{'off'} = '';
-$checked{'IEEE80211W'}{'on'} = '';
-$checked{'IEEE80211W'}{$wlanapsettings{'IEEE80211W'}} = "checked='checked'";
+$selected{'IEEE80211W'}{'off'} = '';
+$selected{'IEEE80211W'}{'optional'} = '';
+$selected{'IEEE80211W'}{'on'} = '';
+$selected{'IEEE80211W'}{$wlanapsettings{'IEEE80211W'}} = "selected";
$selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
@@ -442,19 +443,20 @@ print<<END
    	<option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option>
    	<option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option>
    	<option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option>
+		<option value='wpa3' $selected{'ENC'}{'wpa3'}>WPA3</option>
    	<option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
+		<option value='wpa2+3' $selected{'ENC'}{'wpa2+3'}>WPA2+3</option>
    </select>
 </td></tr>
 <tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
 <tr>
    <td width='25%' class='base'>$Lang::tr{'wlanap management frame protection'}:&nbsp;</td>
    <td class='base' colspan="3">
-		<label>
-			$Lang::tr{'on'} <input type='radio' name='IEEE80211W' value='on' $checked{'IEEE80211W'}{'on'} />
-		</label> |
-		<label>
-			<input type='radio' name='IEEE80211W' value='off' $checked{'IEEE80211W'}{'off'} /> $Lang::tr{'off'}
-		</label>
+		<select name="IEEE80211W">
+			<option value="off" $selected{'IEEE80211W'}{'off'}>$Lang::tr{'wlanap 802.11w disabled'}</option>
+			<option value="optional" $selected{'IEEE80211W'}{'optional'}>$Lang::tr{'wlanap 802.11w optional'}</option>
+			<option value="on" $selected{'IEEE80211W'}{'on'}>$Lang::tr{'wlanap 802.11w enforced'}</option>
+		</select>
    </td>
 </tr>
 <tr><td colspan='4'><br></td></tr>
@@ -684,6 +686,8 @@ END
  # Management Frame Protection (802.11w)
  if ($wlanapsettings{'IEEE80211W'} eq "on") {
    print CONFIGFILE "ieee80211w=2\n";
+ } elsif ($wlanapsettings{'IEEE80211W'} eq "optional") {
+	print CONFIGFILE "ieee80211w=1\n";
  } else {
    print CONFIGFILE "ieee80211w=0\n";
  }
@@ -707,6 +711,16 @@ wpa_passphrase=$wlanapsettings{'PWD'}
 wpa_key_mgmt=WPA-PSK
 rsn_pairwise=CCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa3'){
+	print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=SAE
+rsn_pairwise=CCMP
+END
 ;
  } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){
    print CONFIGFILE <<END
@@ -718,6 +732,16 @@ wpa_key_mgmt=WPA-PSK
 wpa_pairwise=TKIP
 rsn_pairwise=CCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa2+3'){
+	print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK SAE
+rsn_pairwise=CCMP
+END
 ;
  }
    close CONFIGFILE;
diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index d99a3e611..0914ceb78 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -26,73 +26,66 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-my $css = <<END
+my $extraHead = <<END
 <style>
-	table {
+	table#zoneconf {
    	width: 100%;
    	border-collapse: collapse;
    	table-layout: fixed;
    }
-	tr {
+	#zoneconf tr {
    	height: 4em;
    }
-	tr.thin {
-		height: 3em;
+	#zoneconf td {
+		padding: 5px 10px;
+		border: 0.5px solid black;
+		text-align: center;
    }
-	td.narrow {
-		width: 11em;
+	/* dark grey header cells */
+	#zoneconf td.heading {
+		background-color: grey;
+		color: white;
+	}	
+	#zoneconf td.heading::first-line {
+		font-weight: bold;
+		line-height: 1.6;
    }
-	td {
-		padding: 5px;
-		padding-left: 10px;
-		padding-right: 10px;
-		border: 0.5px solid black;
+	/* narrow left column */
+	#zoneconf tr > td:first-child {
+		width: 11em;
    }
-	td.slightlygrey {
+	/* alternating row background color */
+	#zoneconf tr:nth-child(2n+3) {
    	background-color: #F0F0F0;
    }
-	td.h {
-		background-color: grey;
-		color: white;
-		font-weight: 800;
-	}
-
-	td.green {
+	#zoneconf td.green {
    	background-color: $Header::colourgreen;
    }
-	td.red {
+	#zoneconf td.red {
    	background-color: $Header::colourred;
    }
-	td.blue {
+	#zoneconf td.blue {
    	background-color: $Header::colourblue;
    }
-	td.orange {
+	#zoneconf td.orange {
    	background-color: $Header::colourorange;
    }
-	td.topleft {
-		background-color: white;
+	#zoneconf td.topleft {
+		background-color: $Header::pagecolour;
    	border-top-style: none;
    	border-left-style: none;
    }
-	td.disabled {
-		background-color: #cccccc;
-	}
-
-	td.textcenter {
-		text-align: center;
-	}
-
    input.vlanid {
    	width: 4em;
    }
@@ -107,11 +100,9 @@ my $css = <<END
    #submit-container.input {
    	margin-left: auto;
    }
-
-	button {
-		margin-top: 1em;
-	}
 </style>
+
+<script src="/include/zoneconf.js"></script>
 END
 ;
@@ -162,7 +153,7 @@ foreach (@nics) {
    }
 }
-&Header::openpage($Lang::tr{"zoneconf title"}, 1, $css);
+&Header::openpage($Lang::tr{"zoneconf title"}, 1, $extraHead);
 &Header::openbigbox('100%', 'center');
### Evaluate POST parameters ###
@@ -290,7 +281,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
    if ($VALIDATE_error) {
    	&Header::openbox('100%', 'left', $Lang::tr{"error"});
-		print "$VALIDATE_error<br><a href='/cgi-bin/zoneconf.cgi'><button>$Lang::tr{'ok'}</button></a>";
+		print "$VALIDATE_error<br><br><a href='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'back'}</a>\n";
&Header::closebox();
    	&Header::closebigbox();
@@ -311,9 +302,9 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
print <<END
 <form method='post' enctype='multipart/form-data'>
-	<table>
-		<tr>
-		<td class="h narrow topleft" /td>
+	<table id="zoneconf">
+	<tr>
+		<td class="topleft"></td>
 END
 ;
@@ -332,7 +323,7 @@ foreach (@zones) {
    	my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP"));
if ($red_restricted) {
-			print "<td class='h textcenter $_'>$uc ($red_type)</td>";
+			print "\t\t<td class='heading $_'>$uc ($red_type)</td>\n";
next; # We're done here
    	}
@@ -350,7 +341,7 @@ foreach (@zones) {
    }
print <<END
-		<td class='h textcenter $_'>$uc</br>
+		<td class='heading $_'>$uc<br>
    		<select name="MODE $uc">
    			<option value="DEFAULT" $mode_selected{"DEFAULT"}>$Lang::tr{"zoneconf nicmode default"}</option>
    			<option value="BRIDGE" $mode_selected{"BRIDGE"}>$Lang::tr{"zoneconf nicmode bridge"}</option>
@@ -361,21 +352,21 @@ END
 ;
 }
-print "</tr>";
-
-my $slightlygrey = "";
+print "\t</tr>\n";
foreach (@nics) {
    my $mac = $_->[0];
    my $nic = $_->[1];
    my $wlan = $_->[2];
-	print "<tr><td class='h narrow textcenter'>$nic<br>$mac</td>";
+	print "\t<tr>\n";
+	print "\t\t<td class='heading'>$nic<br>$mac</td>\n";
# Iterate through all zones and check if the current NIC is assigned to it
    foreach (@zones) {
    	my $uc = uc $_;
    	my $dev_name = $ethsettings{"${uc}_DEV"};
+		my $highlight = "";
if ($dev_name eq "") { # Again, skip the zone if it is not activated
    		next;
@@ -391,9 +382,15 @@ foreach (@nics) {
if ($mac eq $ethsettings{"${uc}_MACADDR"}) {
    				$checked = "checked";
+					$highlight = $_;
    			}
-				print "<td class='textcenter $slightlygrey'><input type='radio' id='PPPACCESS $mac' name='PPPACCESS' value='$mac' $checked></td>";
+				print <<END
+		<td class="$highlight">
+			<input type="radio" name="PPPACCESS" value="$mac" data-zone="RED" data-mac="$mac" onchange="highlightAccess(this)" $checked>
+		</td>
+END
+;
    			next; # We're done here
    		}
    	}
@@ -431,26 +428,25 @@ foreach (@nics) {
    	$access_selected{"NONE"} = ($access_selected{"NATIVE"} eq "") && ($access_selected{"VLAN"} eq "") ? "selected" : "";
    	my $vlan_disabled = ($wlan) ? "disabled" : "";
+		# If the interface is assigned, hightlight table cell
+		if ($access_selected{"NONE"} eq "") {
+			$highlight = $_;
+		}
+
    	print <<END
-			<td class="textcenter $slightlygrey">
-				<select name="ACCESS $uc $mac" onchange="document.getElementById('TAG $uc $mac').disabled = (this.value === 'VLAN' ? false : true)">
-					<option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option>
-					<option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option>
-					<option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option>
-				</select>
-				<input type="number" class="vlanid" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
-			</td>
+		<td class="$highlight">
+			<select name="ACCESS $uc $mac" data-zone="$uc" data-mac="$mac" onchange="highlightAccess(this)">
+				<option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option>
+				<option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option>
+				<option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option>
+			</select>
+			<input type="number" class="vlanid" id="TAG-$uc-$mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
+		</td>
 END
 ;
    }
-	print "</tr>";
-
-	if ($slightlygrey) {
-		$slightlygrey = "";
-	} else {
-		$slightlygrey = "slightlygrey";
-	}
+	print "\t</tr>\n";
 }
print <<END
diff --git a/html/html/include/zoneconf.js b/html/html/include/zoneconf.js
new file mode 100644
index 000000000..d76f0ab68
--- /dev/null
+++ b/html/html/include/zoneconf.js
@@ -0,0 +1,56 @@
+/*#############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+#############################################################################*/
+
+//zoneconf.cgi dynamic highlighting of interface access selection
+//(call this from "onchange" event of selection elements)
+function highlightAccess(selectObj) {
+	if(!(selectObj && ('zone' in selectObj.dataset) && ('mac' in selectObj.dataset))) {
+		return; //required parameters are missing
+	}
+
+	var zoneColor = selectObj.dataset.zone.trim().toLowerCase(); //zone color (red/green/blue/orange) CSS class
+
+	function colorParentCell(obj, color, enabled = true) { //find nearest parent table cell of "obj" and set its CSS color class
+		do {
+			obj = obj.parentElement;
+		} while(obj && (obj.nodeName.toUpperCase() !== 'TD'));
+		if(obj && (['green', 'red', 'orange', 'blue'].includes(color))) {
+			obj.classList.toggle(color, enabled);
+		}
+	}
+
+	//handle other associated input fields
+	if(selectObj.type.toUpperCase() === 'RADIO') { //this is a radio button group: clear all highlights
+		let radios = document.getElementsByName(selectObj.name);
+		radios.forEach(function(button) {
+			if(button.nodeName.toUpperCase() === 'INPUT') { //make sure the found element is a button
+				colorParentCell(button, zoneColor, false); //remove css
+			}
+		});
+	} else { //this is a dropdown menu: enable/disable additional VLAN tag input box
+		let tagInput = document.getElementById('TAG-' + selectObj.dataset.zone + '-' + selectObj.dataset.mac); //tag input element selector
+		if(tagInput) {
+			tagInput.disabled = (selectObj.value !== 'VLAN'); //enable tag input if VLAN mode selected
+		}
+	}
+
+	//if interface is assigned, highlight table cell in zone color
+	colorParentCell(selectObj, zoneColor, (selectObj.value !== 'NONE'));
+}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6ad0e02c5..2fb46e741 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -444,6 +444,7 @@
 'are you sure' => 'Sind Sie sicher?',
 'arp table entries' => 'Einträge der ARP-Tabelle',
 'artist' => 'Künstler',
+'asn lookup failed' => 'AS-Auflösung gescheitert',
 'atm device' => 'Device:',
 'atm settings' => 'ATM-Einstellungen',
 'attemps' => 'Versuche',
@@ -451,6 +452,7 @@
 'august' => 'August',
 'authentication' => 'Authentifizierung:',
 'automatic' => 'Automatisch',
+'autonomous system' => 'Autonomes System',
 'available updates' => 'Verfügbare Updates:',
 'average' => 'Durchschnitt',
 'avoid dod' => 'Benutzen Sie diese Option nicht mit Dial on Demand! Wird hauptsächlich verwendet, wenn Ihr IPFire sich hinter einem Router befindet. Ihre ROTE IP muss sich innerhalb eines der drei reservierten Netzwerkbereiche befinden z.B. 10/8, 172.16/12, 192.168/16.',
@@ -819,7 +821,6 @@
 'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu',
 'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.',
 'dnat address' => 'Firewall-Interface',
-'dns' => 'Domain Name System',
 'dns address deleted' => 'Erfolgreich gelöscht! ',
 'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
 'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.',
@@ -829,6 +830,7 @@
 'dns configuration' => 'DNS-Konfiguration',
 'dns desc' => 'Wenn auf Schnittstelle red0 die IP-Adressinformationen über DHCP vom Provider kommen, werden automatisch die DNS-Server-Adressen des Providers gesetzt. Hier können Sie nun diese mit den eigenen DNS-Server-IP-Adressen überschreiben.',
 'dns enable safe-search' => 'Safe Search via DNS aktivieren',
+'dns enable safe-search youtube' => 'YouTube in Safe Search einbeziehen',
 'dns error 0' => 'Die IP Adresse vom <strong>primären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>sekundären</strong> DNS Server Adresse ist jedoch gültig.<br />',
 'dns error 01' => 'Die eingegebene IP Adresse des <strong>primären</strong> wie auch des <strong>sekundären</strong> DNS-Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!',
 'dns error 1' => 'Die IP Adresse vom <strong>sekundären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>primäre</strong> DNS Server Adresse ist jedoch gültig.',
@@ -848,7 +850,6 @@
 'dns recursor mode' => 'Recursor-Modus',
 'dns saved' => 'Erfolgreich gespeichert!',
 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!',
-'dns server' => 'DNS Server',
 'dns servers' => 'DNS-Server',
 'dns title' => 'Domain Name System',
 'dns tls hostname' => 'TLS-Hostname',
@@ -1504,7 +1505,9 @@
 'ip alias added' => 'Externer IP-Alias hinzugefügt',
 'ip alias changed' => 'Externer IP-Alias geändert',
 'ip alias removed' => 'Externer IP-Alias entfernt',
-'ip info' => 'IP-Information',
+'ip basic info' => 'Grundlegende IP-Informationen',
+'ip info' => 'IP-Informationen',
+'ip info for' => 'IP-Informationen für',
 'ipfire has now rebooted' => 'IPFire wird neu gestartet.',
 'ipfire has now shutdown' => 'IPFire wird heruntergefahren.',
 'ipfire side' => 'IPFire Seite:',
@@ -1596,7 +1599,6 @@
 'logging server' => 'Protokollierungsserver',
 'loginlogout' => 'Login/Logout',
 'logs' => 'Protokolldateien',
-'lookup failed' => 'Reverse Lookup gescheitert',
 'loosedirectorychecking' => 'Loose directorychecking',
 'low' => 'Niedrig',
 'ls_dhcpd' => 'DHCP-Server:',
@@ -2069,6 +2071,7 @@
 'proxy reports weekly' => 'Wöchentliche Berichte',
 'psk' => 'PSK',
 'ptr' => 'PTR',
+'ptr lookup failed' => 'Reverse Lookup gescheitert',
 'pulse' => 'Puls',
 'pulse dial' => 'Pulswahl:',
 'qos add subclass' => 'Unterklasse hinzufügen',
@@ -2406,6 +2409,9 @@
 'tor exit country' => 'Exit-Land',
 'tor exit country any' => 'Beliebig',
 'tor exit nodes' => 'Exitknoten',
+'tor guard country' => 'Guard-Land',
+'tor guard country any' => 'Beliebig',
+'tor guard nodes' => 'Guardknoten',
 'tor relay address' => 'Relais-Adresse',
 'tor relay configuration' => 'Tor-Relais-Konfiguration',
 'tor relay enabled' => 'Tor-Relais einschalten',
@@ -2424,7 +2430,8 @@
 'tor traffic limit hard' => 'Das Übertragungslimit wurde erreicht.',
 'tor traffic limit soft' => 'Das Übertragungslimit wurde fast erreicht. Es werden keine neuen Verbindungen akzeptiert.',
 'tor traffic read written' => 'Gesamter Traffic (empfangen/gesendet)',
-'tor use exit nodes' => 'Nur diese Exitknoten benutzen (einer pro Zeile)',
+'tor use exit nodes' => 'Nur diese Exitknoten benutzen (ein Fingerabdruck pro Zeile)',
+'tor use guard nodes' => 'Nur diese Guardknoten benutzen (ein Fingerabdruck pro Zeile)',
 'total connection time' => 'Gesammte Verbindungszeit',
 'total hits for log section' => 'Gesamte Treffer für Protokollsektion',
 'traffic back' => 'Zurück',
@@ -2864,6 +2871,7 @@
 'week-graph' => 'Woche',
 'weekly firewallhits' => 'wöchentliche Firewalltreffer',
 'weeks' => 'Wochen',
+'whois results from' => 'WHOIS-Ergebnisse von',
 'wildcards' => 'Wildcards',
 'wins server' => 'WINS-Server',
 'wins support' => 'WINS-Support',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 0b4f098a7..b5284effa 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -443,6 +443,7 @@
 'are you sure' => 'Are you sure?',
 'arp table entries' => 'ARP Table Entries',
 'artist' => 'Artist',
+'asn lookup failed' => 'AS lookup failed',
 'atm device' => 'Device:',
 'atm settings' => 'ATM settings',
 'attemps' => 'Attempts',
@@ -450,6 +451,7 @@
 'august' => 'August',
 'authentication' => 'Authentication:',
 'automatic' => 'Automatic',
+'autonomous system' => 'Autonomous System',
 'available updates' => 'Available updates:',
 'average' => 'Average',
 'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16',
@@ -851,6 +853,7 @@
 'dns could not add server' => 'Could not add server - Reason:',
 'dns desc' => 'If the red0 interface gets the IP address information via DHCP from the provider, the DNS server addresses will be set automatically. Now here you are able to change these DNS server IP addresses with your own ones.',
 'dns enable safe-search' => 'Enable Safe Search',
+'dns enable safe-search youtube' => 'Include YouTube in Safe Search',
 'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.',
 'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!',
 'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.',
@@ -870,7 +873,6 @@
 'dns recursor mode' => 'Recursor Mode',
 'dns saved' => 'Successfully saved!',
 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
-'dns server' => 'DNS Server',
 'dns servers' => 'DNS Servers',
 'dns title' => 'Domain Name System',
 'dns tls hostname' => 'TLS Hostname',
@@ -1531,7 +1533,9 @@
 'ip alias added' => 'External IP alias added',
 'ip alias changed' => 'External IP alias changed',
 'ip alias removed' => 'External IP alias removed',
-'ip info' => 'IP Information',
+'ip basic info' => 'Basic IP information',
+'ip info' => 'IP information',
+'ip info for' => 'IP information for',
 'ipfire has now rebooted' => 'IPFire is rebooting now.',
 'ipfire has now shutdown' => 'IPFire is shutting down now.',
 'ipfire side' => 'IPFire side:',
@@ -1623,7 +1627,6 @@
 'logging server' => 'Logging Server',
 'loginlogout' => 'Login/Logout',
 'logs' => 'logs',
-'lookup failed' => 'Reverse lookup failed',
 'loosedirectorychecking' => 'Loosedirectorychecking',
 'low' => 'Low',
 'ls_dhcpd' => 'DHCP Server:',
@@ -2099,6 +2102,7 @@
 'proxy reports weekly' => 'Weekly reports',
 'psk' => 'PSK',
 'ptr' => 'PTR',
+'ptr lookup failed' => 'Reverse lookup failed',
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos add subclass' => 'Add subclass',
@@ -2446,6 +2450,9 @@
 'tor exit country' => 'Exit country',
 'tor exit country any' => 'Any country',
 'tor exit nodes' => 'Exit Nodes',
+'tor guard country' => 'Guard country',
+'tor guard country any' => 'Any country',
+'tor guard nodes' => 'Guard Nodes',
 'tor relay address' => 'Relay address',
 'tor relay configuration' => 'Tor Relay Configuration',
 'tor relay enabled' => 'Enable Tor Relay',
@@ -2464,7 +2471,8 @@
 'tor traffic limit hard' => 'Traffic limit has been reached.',
 'tor traffic limit soft' => 'Traffic limit almost reached. Not accepting any new connections.',
 'tor traffic read written' => 'Total traffic (read/written)',
-'tor use exit nodes' => 'Use only these exit nodes (one per line)',
+'tor use exit nodes' => 'Use only these exit nodes (one fingerprint per line)',
+'tor use guard nodes' => 'Use only these guard nodes (one fingerprint per line)',
 'total connection time' => 'Total Connection Time',
 'total hits for log section' => 'Total hits for log section',
 'traffic back' => 'Back',
@@ -2907,6 +2915,7 @@
 'week-graph' => 'Week',
 'weekly firewallhits' => 'weekly firewallhits',
 'weeks' => 'Weeks',
+'whois results from' => 'WHOIS results from',
 'wildcards' => 'Wildcards',
 'winbind daemon' => 'Winbind Daemon',
 'wins server' => 'Wins Server',
@@ -2962,6 +2971,9 @@
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlan clients' => 'Wireless clients',
 'wlanap' => 'Access Point',
+'wlanap 802.11w disabled' => 'Disabled',
+'wlanap 802.11w enforced' => 'Enforced',
+'wlanap 802.11w optional' => 'Optional',
 'wlanap auto' => 'Automatic Channel Selection',
 'wlanap broadcast ssid' => 'Broadcast SSID',
 'wlanap channel' => 'Channel',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index ae155d26b..93a15bba0 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1096,7 +1096,6 @@
 'logging server' => 'Servidor de conexión',
 'loginlogout' => 'Login/Logout',
 'logs' => 'registros',
-'lookup failed' => 'Falló la búsqueda reversiva',
 'loosedirectorychecking' => 'Chequeo de loosedirectory',
 'low' => 'Bajo',
 'ls_dhcpd' => 'Servidor DHCP:',
@@ -1450,6 +1449,7 @@
 'proxy port' => 'Puerto de proxy',
 'proxy reconfigure' => 'Grabar y Recargar',
 'psk' => 'PSK',
+'ptr lookup failed' => 'Falló la búsqueda reversiva',
 'pulse' => 'Pulso',
 'pulse dial' => 'Marcaro por pulsos:',
 'qos add subclass' => 'Añadir subclase',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index aa41429f6..a2d27939c 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -762,6 +762,7 @@
 'demon login script' => 'Script de login du service',
 'deprecated fs warn' => 'Système de fichiers obsolète ! Le nouveau noyau supprime le support. Sauvegarde et reformatage !',
 'description' => 'Description',
+'desired' => 'Voulu',
 'dest ip and port' => 'IP Dest.:Port',
 'destination' => 'Destination',
 'destination ip' => 'IP de destination',
@@ -826,6 +827,7 @@
 'dialup settings' => 'Réglage de connexion',
 'directory mask' => 'Droits des répertoires UNIX',
 'directory writeable' => 'Ecriture possible dans ce répertoire',
+'disable' => 'Désactiver',
 'disabled' => 'Arrêté',
 'disconnect' => 'OVPN stoppé / déconnecté',
 'disconnected' => 'Déconnecté',
@@ -845,7 +847,6 @@
 'dmz pinhole rule removed' => 'Règle DMZ pinhole supprimée; Redémarrage DMZ pinhole',
 'dmzpinholes for same net not necessary' => 'Les DMZ Pinholes ne sont pas forcément dans le même réseau. Choisir différentes sources ou destinations réseau.',
 'dnat address' => 'Interface pare-feu',
-'dns' => 'Système de noms de domaines',
 'dns address deleted' => 'Suppression effectuée !',
 'dns address deleted txt' => 'Les adresses du serveur DNS ont été supprimées avec succès.<br />Vous devez redémarrer ou reconnecter pour que les modifications prennent effet !',
 'dns address done' => 'Les adresses du serveur DNS vont être sauvegardées.',
@@ -875,7 +876,6 @@
 'dns recursor mode' => 'Exécution en mode récursif.',
 'dns saved' => 'Sauvegarde effectuée !',
 'dns saved txt' => 'La sauvegarde des deux adresses saisies du serveur DNS a été effectée correctement.<br />Vous devez redémarrer ou vous reconnecter pour que les changements prennent effets !',
-'dns server' => 'Serveur DNS',
 'dns servers' => 'Serveurs DNS',
 'dns title' => 'Système de noms de domaine (DNS)',
 'dns tls hostname' => 'Nom d'hôte TLS',
@@ -995,6 +995,7 @@
 'emerging rules' => 'Règles de la communauté Emergingthreats.net',
 'empty' => 'Ce champ peut être laissé vide',
 'empty profile' => 'vide',
+'enable' => 'Activer',
 'enable ignore filter' => 'Activer le filtre d'exclusion ',
 'enable javascript' => 'Activer Javascript',
 'enable smt' => 'Activer le partage d'un cœur de processeur (SMT)',
@@ -1626,7 +1627,6 @@
 'logging server' => 'Serveur de connexion',
 'loginlogout' => 'Connexion/Quitter',
 'logs' => 'Journaux',
-'lookup failed' => 'La recherche inversée a échouée',
 'loosedirectorychecking' => 'Echec de la vérification du répertoire',
 'low' => 'Bas',
 'ls_dhcpd' => 'Serveur DHCP :',
@@ -1787,6 +1787,7 @@
 'net traffic newversion' => 'Nouvelle version de net-traffic disponible :',
 'net-traffic configuration' => 'Configuration net-traffic',
 'netbios name' => 'Nom Netbios',
+'netbios nameserver daemon' => 'Service du serveur de noms NetBIOS',
 'netmask' => 'Masque réseau ',
 'network' => 'Réseau',
 'network added' => 'Réseau personnalisé ajouté',
@@ -1883,6 +1884,7 @@
 'openvpn prefix remote subnet' => 'L'utilisation de la notation préfixe n'est pas prise en charge pour le sous-réseau distant. Veuillez entrer un masque de sous-réseau comme 255.255.255.0.',
 'openvpn server' => 'Serveur OpenVPN',
 'openvpn subnet is used' => 'Le sous-réseau donné est utilisé par un autre serveur OpenVPN.',
+'optional' => 'Optionnel',
 'optional at cmd' => 'Commande AT optionnelle',
 'optional data' => '3. Paramètres optionnels :',
 'options' => 'Options',
@@ -1906,7 +1908,7 @@
 'outgoing' => 'sortant',
 'outgoing compression in bytes per second' => 'Compression sortante',
 'outgoing firewall' => 'Pare-feu sortant',
-'outgoing firewall access' => 'Accès sortant au pare-feu',
+'outgoing firewall access' => 'Accès sortant du pare-feu',
 'outgoing firewall add ip group' => 'Ajouter un groupe d'adresses IP',
 'outgoing firewall add mac group' => 'Ajouter un groupe d'adresses MAC',
 'outgoing firewall edit ip group' => 'Modifier un groupe d'adresses IP',
@@ -2102,6 +2104,7 @@
 'proxy reports weekly' => 'Rapports hebdomadaires',
 'psk' => 'PSK',
 'ptr' => 'PTR',
+'ptr lookup failed' => 'La recherche inversée a échouée',
 'pulse' => 'Impulsion',
 'pulse dial' => 'Numérotation par impulsions :',
 'qos add subclass' => 'Ajouter une sous-classe',
@@ -2153,6 +2156,7 @@
 'reportlevel' => 'Niveau de rapport',
 'request' => 'Interrogation',
 'requested data' => '1. Paramètres de connexion :',
+'required' => 'Requis',
 'required field' => 'Champs requis',
 'reserved dst port' => 'Le port de destination est réservé pour l'usage d'IPFire :',
 'reserved src port' => 'Le port source est réservé pour l'usage d'IPFire :',
@@ -2187,6 +2191,8 @@
 'samba' => 'Samba',
 'samba join a domain' => 'Joindre un domaine',
 'samba join domain' => 'Joindre domaine',
+'samba server role member' => 'Membre du domaine',
+'samba server role standalone' => 'Autonome',
 'samba status' => 'Statut Samba',
 'saturday' => 'Samedi',
 'save' => 'Sauvegarder',
@@ -2262,6 +2268,7 @@
 'smart information' => 'Informations S.M.A.R.T.',
 'smartwarn1' => 'Périphérique :',
 'smartwarn2' => 'rapports des erreurs S.M.A.R.T.',
+'smb daemon' => 'Service SMB',
 'smbreload' => 'Recharger Samba',
 'smbrestart' => 'Redémarrer Samba',
 'smbstart' => 'Démarrer Samba',
@@ -2834,6 +2841,7 @@
 'used swap' => 'Swap utilisée',
 'user' => 'Utilisateur',
 'user log' => 'log utilisateur',
+'user management' => 'Gestion utilisateur',
 'user proxy logs' => 'log utilisateur proxy',
 'username' => 'Nom utilisateur :',
 'username not set' => 'Nom d'utilisateur non défini.',
@@ -2908,6 +2916,7 @@
 'weekly firewallhits' => 'Contacts hebdomadaires du pare-feu',
 'weeks' => 'semaine(s)',
 'wildcards' => 'Jokers',
+'winbind daemon' => 'Service Winbind',
 'wins server' => 'Serveur Wins',
 'wins support' => 'Support Wins',
 'wireless' => 'Sans fil',
@@ -2961,6 +2970,9 @@
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlan clients' => 'Clients sans fil',
 'wlanap' => 'Point d'accès',
+'wlanap 802.11w disabled' => 'Désactivé',
+'wlanap 802.11w enforced' => 'Forcé',
+'wlanap 802.11w optional' => 'Optionnel',
 'wlanap auto' => 'Sélection automatique du canal',
 'wlanap broadcast ssid' => 'Diffusion du SSID',
 'wlanap channel' => 'Canal',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index d0e9dc4c9..14436de4b 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -764,7 +764,6 @@
 'dns proxy server' => 'DNS Proxy Server',
 'dns saved' => 'Successfully saved!',
 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
-'dns server' => 'DNS Server',
 'dns servers' => 'DNS Servers',
 'dns title' => 'Domain Name System',
 'dnsforward' => 'Inoltro DNS',
@@ -1410,7 +1409,6 @@
 'logging server' => 'Logging Server',
 'loginlogout' => 'Login/Logout',
 'logs' => 'Gestione Log',
-'lookup failed' => 'Reverse lookup failed',
 'loosedirectorychecking' => 'Loosedirectorychecking',
 'low' => 'Basso',
 'ls_dhcpd' => 'DHCP Server:',
@@ -1845,6 +1843,7 @@
 'proxy reports today' => 'Oggi',
 'proxy reports weekly' => 'Weekly reports',
 'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup failed',
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos add subclass' => 'Add subclass',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index f67eb0383..53341a6f8 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -754,7 +754,7 @@
 'dns proxy server' => 'DNS Proxy Server',
 'dns saved' => 'Succesvol opgeslagen!',
 'dns saved txt' => 'De twee ingevoerde DNS serveradressen zijn succesvol opgeslagen.<br />U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!',
-'dns server' => 'DNS Server',
+'dns servers' => 'DNS Server',
 'dns title' => 'Domein Naam Systeem',
 'dnsforward' => 'DNS Forwarding',
 'dnsforward add a new entry' => 'Voeg een nieuwe regel toe',
@@ -1389,7 +1389,6 @@
 'logging server' => 'Loggingserver',
 'loginlogout' => 'Login/Logout',
 'logs' => 'logs',
-'lookup failed' => 'Reverse lookup mislukt',
 'loosedirectorychecking' => 'Loosedirectorychecking',
 'low' => 'Laag',
 'ls_dhcpd' => 'DHCP Server:',
@@ -1798,6 +1797,7 @@
 'proxy reports today' => 'Vandaag',
 'proxy reports weekly' => 'Wekelijkse rapporten',
 'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup mislukt',
 'pulse' => 'Puls',
 'pulse dial' => 'Pulskiezen:',
 'qos add subclass' => 'Voeg sub-klasse toe',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 3f4fc0143..63c8a1793 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -686,7 +686,7 @@
 'dns proxy server' => 'Serwer Proxy DNS',
 'dns saved' => 'Zapisano poprawnie!',
 'dns saved txt' => 'Podane adresy serwerów DNS zostały poprawnie zapisane. <br />Należy wykonać restart lub wykonać ponowne łączenie, aby zmiany zostały zastosowane!',
-'dns server' => 'Serwer DNS',
+'dns servers' => 'Serwer DNS',
 'dns title' => 'Domain Name System',
 'do not log this port list' => 'Odrzucaj tą listę portów zanim zostaną zapisane do logu (zmniejsza rozmiar logów)',
 'dod' => 'Łącz na żądanie',
@@ -1095,7 +1095,6 @@
 'logging server' => 'Serwer logowania',
 'loginlogout' => 'Zalogowanie/wylogowanie',
 'logs' => 'logi',
-'lookup failed' => 'Reverse lookup failed',
 'loosedirectorychecking' => 'Loosedirectorychecking',
 'low' => 'Niski',
 'ls_dhcpd' => 'Serwer DHCP:',
@@ -1462,6 +1461,7 @@
 'proxy port' => 'Port Proxy',
 'proxy reconfigure' => 'Zapisz i zładuj',
 'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup failed',
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos add subclass' => 'Dodaj podklasę',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 2c91a3fee..4f69dc47a 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -682,7 +682,7 @@
 'dns proxy server' => 'DNS Proxy Сервер',
 'dns saved' => 'Successfully saved!',
 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
-'dns server' => 'DNS Сервер',
+'dns servers' => 'DNS Сервер',
 'dns title' => 'Domain Name System',
 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
 'dod' => 'Dial on Demand',
@@ -1088,7 +1088,6 @@
 'logging server' => 'Сервер Логов',
 'loginlogout' => 'Login/Logout',
 'logs' => 'Логи',
-'lookup failed' => 'Reverse lookup failed',
 'loosedirectorychecking' => 'Loosedirectorychecking',
 'low' => 'Low',
 'ls_dhcpd' => 'DHCP сервер:',
@@ -1457,6 +1456,7 @@
 'proxy port' => 'Порт Proxy',
 'proxy reconfigure' => 'Сохранить и перезапустить',
 'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup failed',
 'pulse' => 'Импульсный',
 'pulse dial' => 'Импульсный набор:',
 'qos add subclass' => 'Добавить подкласс',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index b958d63fe..34e8bdcf7 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -836,7 +836,6 @@
 'dns proxy server' => 'DNS Vekil Sunucusu',
 'dns saved' => 'Başarıyla kaydedildi!',
 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi.<br />Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!',
-'dns server' => 'DNS Sunucusu',
 'dns servers' => 'DNS sunucuları',
 'dns title' => 'Etki Alanı Ad Sistemi',
 'dnsforward' => 'DNS Yönlendirmesi',
@@ -1540,7 +1539,6 @@
 'logging server' => 'Günlük Sunucusu',
 'loginlogout' => 'Giriş/Çıkış',
 'logs' => 'Günlükler',
-'lookup failed' => 'Ters arama başarısız',
 'loosedirectorychecking' => 'Serbest Dizin Denetimi',
 'low' => 'Düşük',
 'ls_dhcpd' => 'DHCP Sunucusu:',
@@ -1993,6 +1991,7 @@
 'proxy reports today' => 'Bugün',
 'proxy reports weekly' => 'Haftalık rapor',
 'psk' => 'PSK',
+'ptr lookup failed' => 'Ters arama başarısız',
 'pulse' => 'Darbe',
 'pulse dial' => 'Darbeli arama:',
 'qos add subclass' => 'Alt sınıf ekle',
diff --git a/lfs/amavisd b/lfs/amavisd
deleted file mode 100644
index 43d3c6060..000000000
--- a/lfs/amavisd
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.11.1
-
-THISAPP    = amavisd-new-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = amavisd
-PAK_VER    = 3
-
-DEPS       = clamav spamassassin perl-Net-LibIDN
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = f89fc043c790e35137121e45f2890703
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && cp -f amavisd /usr/bin
-	chown root.root /usr/bin/amavisd
-	chmod 755 /usr/bin/amavisd
-
-	#install initscripts
-	$(call INSTALL_INITSCRIPT,amavisd)
-
-	cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc
-	chown root.root /etc/amavisd.conf
-	chmod 644 /etc/amavisd.conf
-	-mkdir -p /var/amavis/{db,tmp} /var/virusmails
-	chown amavis.amavis -Rv /var/{amavis,virusmails}
-	chmod 750 -Rv /var/{amavis,virusmails}
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent
index b5bd8ef38..a029cf7ec 100644
--- a/lfs/amazon-ssm-agent
+++ b/lfs/amazon-ssm-agent
@@ -24,7 +24,7 @@
include Config
-VER        = 2.3.930.0
+VER        = 3.0.356.0
 SUP_ARCH   = x86_64
THISAPP    = amazon-ssm-agent-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amazon-ssm-agent
-PAK_VER    = 4
+PAK_VER    = 6
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cf7c50976e2853764d308581f94cbdd1
+$(DL_FILE)_MD5 = 5657c0f4400b1c573ad4e9f1c5845537
install : $(TARGET)
@@ -102,6 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    mkdir -pv /etc/amazon/ssm /usr/bin /var/lib/amazon/ssm
    cd $(DIR_BUILD) && install -v -m 755 \
    	bin/linux_amd64/amazon-ssm-agent \
+		bin/linux_amd64/ssm-agent-worker \
    	bin/linux_amd64/ssm-cli \
    	bin/linux_amd64/ssm-document-worker \
    	bin/linux_amd64/ssm-session-worker \
diff --git a/lfs/apcupsd b/lfs/apcupsd
index 22818eda5..6240015d1 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       =
@@ -88,5 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
    ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
    ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd
+	install -v -m 644 ${DIR_SRC}/config/backup/includes/apcupsd \
+			/var/ipfire/backup/addons/includes/apcupsd
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/aws-cli b/lfs/aws-cli
index 45e8f2a95..599469ee3 100644
--- a/lfs/aws-cli
+++ b/lfs/aws-cli
@@ -24,15 +24,15 @@
include Config
-VER        = 1.15.77
+VER        = 1.18.188
-THISAPP    = aws-cli-$(VER)
+THISAPP    = awscli-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = aws-cli
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-yaml
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b4404ee6ff3c1dad1aa1174d063beb71
+$(DL_FILE)_MD5 = d0e6edde94f5bd17bf6024fd6534dc61
install : $(TARGET)
diff --git a/lfs/bash b/lfs/bash
index 79c21896b..9bac360c2 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
    	-i $(DIR_APP)/builtins/enable.def
-	for i in $$(seq 1 11); do \
+	for i in $$(seq 1 18); do \
    	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash50-$$(printf "%03d" "$${i}") || exit 1; \
    done
diff --git a/lfs/configroot b/lfs/configroot
index 0afacebaf..a37c2c401 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -171,7 +171,7 @@ $(TARGET) :
    # Configroot permissions
    chown -R nobody:nobody $(CONFIG_ROOT)
    chown      root:root   $(CONFIG_ROOT)
-	for i in backup/ header.pl general-functions.pl graphs.pl lang.pl addon-lang/ langs/ red/ ; do \
+	for i in backup/ header.pl general-functions.pl graphs.pl lang.pl addon-lang/ langs/ ; do \
             chown -R root:root $(CONFIG_ROOT)/$$i; \
    done
    chown -Rv root:root $(CONFIG_ROOT)/*/bin
diff --git a/lfs/curl b/lfs/curl
index 34dfe90e8..1f188fc02 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
include Config
-VER        = 7.71.1
+VER        = 7.73.0
THISAPP    = curl-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b54b386057846ce3edd3584b19741569
+$(DL_FILE)_MD5 = d7df02d3b78b625fee4dd765808a6eb6
install : $(TARGET)
diff --git a/lfs/ddns b/lfs/ddns
index 0e045ddc4..2a6dbca2b 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Apply upstream patches.
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-duckdns-new-api.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
    cd $(DIR_APP) && ./configure \
diff --git a/lfs/file b/lfs/file
index 4a3323830..ac2db8ceb 100644
--- a/lfs/file
+++ b/lfs/file
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 5.38
+VER        = 5.39
THISAPP    = file-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3217633ed09c7cd35ed8d04191675574
+$(DL_FILE)_MD5 = 1c450306053622803a25647d88f80f25
install : $(TARGET)
diff --git a/lfs/freeradius b/lfs/freeradius
index 7f39ad8e1..c50b3219f 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freeradius
-PAK_VER    = 12
+PAK_VER    = 13
-DEPS       = libtalloc
+DEPS       = libtalloc samba
ifeq "$(BUILD_ARCH)" "armv5tel"
    LDFLAGS += -latomic
diff --git a/lfs/spamassassin b/lfs/gdb
similarity index 85%
rename from lfs/spamassassin
rename to lfs/gdb
index d1ad7ddd7..88ce5d34e 100644
--- a/lfs/spamassassin
+++ b/lfs/gdb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,13 @@
include Config
-VER        = 3.4.2
+VER        = 10.1
-THISAPP    = Mail-SpamAssassin-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = gdb-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = spamassassin
-PAK_VER    = 3
-
-DEPS       =
###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4f4c38a7cd4ae3e3750895ae21d2fc78
+$(DL_FILE)_MD5 = 1822a7dd45e7813f4408407eec1a6af1
install : $(TARGET)
@@ -54,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist: 
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -77,12 +70,16 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
-
-	#install initscripts
-	$(call INSTALL_INITSCRIPT,spamassassin)
-
+	cd $(DIR_APP) && mkdir -pv build
+	cd $(DIR_APP)/build && \
+		../configure \
+			--prefix=/usr \
+			--sysconfdir=/etc \
+			--disable-nls \
+			--enable-tui \
+			--with-system-readline \
+			--with-python=/usr/bin/python3
+	cd $(DIR_APP)/build && make $(MAKETUNING)
+	cd $(DIR_APP)/build && make install
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/ghostscript b/lfs/ghostscript
index 7dd32858e..edf019f5d 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -24,15 +24,15 @@
include Config
-VER        = 9.26
+VER        = 9.53.3
THISAPP    = ghostscript-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ghostscript
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       = cups dbus libtiff
@@ -48,7 +48,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz
 gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz
-$(DL_FILE)_MD5 = 806bc2dedbc7f69b003f536658e08d4a
+$(DL_FILE)_MD5 = bf0b41d6e19fdeb4b050afad309248d2
 ghostscript-fonts-std-8.11.tar.gz_MD5 = 6865682b095f8c4500c54b285ff05ef6
 gnu-gs-fonts-other-6.0.tar.gz_MD5 = 33457d3f37de7ef03d2eea05a9e6aa4f
diff --git a/lfs/git b/lfs/git
index 2928d59e6..125690562 100644
--- a/lfs/git
+++ b/lfs/git
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 17
+PAK_VER    = 18
DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
diff --git a/lfs/go b/lfs/go
index ee884200d..6ebb37080 100644
--- a/lfs/go
+++ b/lfs/go
@@ -24,7 +24,7 @@
include Config
-VER        = 1.14.2
+VER        = 1.15.4
THISAPP    = go-$(VER)
 DL_FILE    = go$(VER).$(GOOS)-$(GOARCH).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 856d248e3ea8a287d13e5f6afd086282
+$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d
install : $(TARGET)
diff --git a/lfs/hostapd b/lfs/hostapd
index b208c732d..f70d09f4b 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 51
+PAK_VER    = 52
DEPS       =
diff --git a/lfs/intel-microcode b/lfs/intel-microcode
index 025a789a5..1aa57cabe 100644
--- a/lfs/intel-microcode
+++ b/lfs/intel-microcode
@@ -24,7 +24,7 @@
include Config
-VER        = 20200616
+VER        = 20201118
THISAPP    = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b5e2f0cc9db2ed3d2760a5a859a0a387
+$(DL_FILE)_MD5 = 6248f95036923c5982800e3f97e08bb8
install : $(TARGET)
diff --git a/lfs/knot b/lfs/knot
index e1fb0fac7..4bb8dcbf0 100644
--- a/lfs/knot
+++ b/lfs/knot
@@ -24,7 +24,7 @@
include Config
-VER        = 3.0.1
+VER        = 3.0.2
THISAPP    = knot-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7dc32e034bab142c7a0fcf6d531ee881
+$(DL_FILE)_MD5 = c4e18bd1e595cffb185a042522985dec
install : $(TARGET)
diff --git a/lfs/libloc b/lfs/libloc
index da53e5149..010ddf1cb 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -78,6 +78,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
+	# Import changes from upstream
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.4-upstream.patch
+
    # Add patch for i586 to disable strong stack protector.
 ifeq "$(BUILD_ARCH)" "i586"
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
@@ -88,7 +91,7 @@ endif
    	--prefix=/usr \
    	--sysconfdir=/etc \
    	--localstatedir=/var \
-		--disable-manpages
+		--disable-man-pages
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/libseccomp b/lfs/libseccomp
index 676b516e9..b04fda5de 100644
--- a/lfs/libseccomp
+++ b/lfs/libseccomp
@@ -24,7 +24,7 @@
include Config
-VER        = 2.4.3
+VER        = 2.4.4
THISAPP    = libseccomp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libseccomp
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3a2c3b7539c1b6a933c20cd1fdcb2252
+$(DL_FILE)_MD5 = 05013a9e372f822f41ac4cb3f18703c0
install : $(TARGET)
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar vxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./autogen.sh
    cd $(DIR_APP) && ./configure \
    	--prefix=/usr \
    	--disable-static
diff --git a/lfs/linux b/lfs/linux
index 1d708a4ce..04205ee57 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
include Config
-VER         = 4.14.198
-ARM_PATCHES = 4.14.198-ipfire0
+VER         = 4.14.210
+ARM_PATCHES = 4.14.210-ipfire0
THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -79,8 +79,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)					= $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz	= $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5					= 9bf8f170f93283549cba55df5247b7b8
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 84b7afe9148e02568777ae0338da3844
+$(DL_FILE)_MD5					= 84918d49079e7a75b4c2450fa3b4fcb9
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 2b0e8e3ebe9827b2bfed7397b043dbc5
install : $(TARGET)
@@ -144,9 +144,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-random_try_to_actively_add_entropy.patch
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.x-add_timer_setup_on_stack.patch
-	# Patch CVE-2020-14386
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_cve-2020-14386_net_packet_fix_overflow_in_tpacket_rcv.patch
-
 ifeq "$(KCFG)" "-multi"
    # Apply Arm-multiarch kernel patches.
    cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
diff --git a/lfs/logwatch b/lfs/logwatch
index 509201743..7aa145121 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR="/tmp"/g" -i install_logwatch.sh
cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
@cd $(DIR_APP) && chmod 755 install_logwatch.sh
    cd $(DIR_APP) && yes "" | ./install_logwatch.sh
diff --git a/lfs/lynis b/lfs/lynis
index 49360abc8..7dc807781 100644
--- a/lfs/lynis
+++ b/lfs/lynis
@@ -24,7 +24,7 @@
include Config
-VER        = 3.0.0
+VER        = 3.0.1
THISAPP    = lynis-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/lynis
 TARGET     = $(DIR_INFO)/$(THISAPP)
PROG       = lynis
-PAK_VER    = 7
+PAK_VER    = 8
 DEPS       =
###############################################################################
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7f6777843fc4f30ea16e4e2bf393f797
+$(DL_FILE)_MD5 = ac984258e89b88c86e8c1c5395de8a15
install : $(TARGET)
diff --git a/lfs/ntp b/lfs/ntp
index 3c4a97033..c8f69039d 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -82,12 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && make install
-mkdir /etc/ntp
-	chown -R ntp:ntp /etc/ntp
-	echo "disable monitor" > /etc/ntp.conf
-	echo "restrict default nomodify noquery" >>  /etc/ntp.conf
-	echo "server  127.127.1.0 prefer"	>> /etc/ntp.conf
-	echo "fudge   127.127.1.0 stratum 10"	>> /etc/ntp.conf
-	echo "driftfile /etc/ntp/drift"		>> /etc/ntp.conf
+	install -v -m 644 $(DIR_SRC)/config/ntp/ntp.conf /etc/ntp.conf
#Enable it by default...
    cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
diff --git a/lfs/openvpn b/lfs/openvpn
index 779bf5520..b026d515b 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@
include Config
-VER        = 2.4.9
+VER        = 2.5.0
THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 446df6dc29364d00929ea9c725412cb8
+$(DL_FILE)_MD5 = ba426e2217833b522810d6c06f7cc8f7
install : $(TARGET)
diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index 421aa11d5..42f1bcbea 100644
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -24,14 +24,14 @@
include Config
-VER        = 4.11.0.6
+VER        = 4.12.0.6
THISAPP    = pcengines-apu-firmware-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pcengines-apu-firmware
-PAK_VER    = 6
+PAK_VER    = 7
 SUP_ARCH   = i586 x86_64
DEPS       = firmware-update
@@ -45,19 +45,22 @@ objects = \
    apu2_v$(VER).rom \
    apu3_v$(VER).rom \
    apu4_v$(VER).rom \
-	apu5_v$(VER).rom
+	apu5_v$(VER).rom \
+	apu6_v$(VER).rom
apu1_v$(VER).rom = $(DL_FROM)/apu1_v$(VER).rom
 apu2_v$(VER).rom = $(DL_FROM)/apu2_v$(VER).rom
 apu3_v$(VER).rom = $(DL_FROM)/apu3_v$(VER).rom
 apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom
 apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom
-
-apu1_v$(VER).rom_MD5 = aa135df1cdbdf488a2c623020c9c94b3
-apu2_v$(VER).rom_MD5 = ba861d29bb90491612e92de8d7db3065
-apu3_v$(VER).rom_MD5 = 52d51b4c0ea1d4a7e05f8b48ec57c0d8
-apu4_v$(VER).rom_MD5 = 22eba7cd14d2be3ddfaa4159f5c169af
-apu5_v$(VER).rom_MD5 = de4da830a5424028b7492876edb41c86
+apu6_v$(VER).rom = $(DL_FROM)/apu6_v$(VER).rom
+
+apu1_v$(VER).rom_MD5 = d2e08bc117683fec306d2f980665a1eb
+apu2_v$(VER).rom_MD5 = d9512a52159d546a34e8d630bfdb383b
+apu3_v$(VER).rom_MD5 = 8cf5bd87f47cfaf7fdcda4bb0fa295fb
+apu4_v$(VER).rom_MD5 = 405bd25c59efda4cf3e94c6e0b153890
+apu5_v$(VER).rom_MD5 = a6ce900704cfecd254be6f4bbd7f1e3b
+apu6_v$(VER).rom_MD5 = 30a1fb088b60b96bb8e17f2eb048b228
install : $(TARGET)
diff --git a/lfs/python3-botocore b/lfs/python3-botocore
index a3083b41a..2413511d3 100644
--- a/lfs/python3-botocore
+++ b/lfs/python3-botocore
@@ -24,7 +24,7 @@
include Config
-VER        = 1.16.1
+VER        = 1.19.28
THISAPP    = botocore-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-botocore
 PAK_VER    = 3
-DEPS       = python3-dateutil python3-jmespath
+DEPS       = python3-dateutil python3-jmespath python3-urllib3
###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 12a0d999c364985f1e21a36286c4ab57
+$(DL_FILE)_MD5 = 9cb390d4c293528db8ca014647bbe03b
install : $(TARGET)
diff --git a/lfs/perl-Net-LibIDN b/lfs/python3-urllib3
similarity index 88%
rename from lfs/perl-Net-LibIDN
rename to lfs/python3-urllib3
index a9ec173b9..30ea26f2d 100644
--- a/lfs/perl-Net-LibIDN
+++ b/lfs/python3-urllib3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,21 +18,20 @@
 #                                                                             #
 ###############################################################################
-
 ###############################################################################
 # Definitions
 ###############################################################################
+
 include Config
-VER        = 0.12
-THISAPP    = Net-LibIDN-$(VER)
-DL_FILE    = ${THISAPP}.tar.gz
+VER        = 1.26.2
+
+THISAPP    = urllib3-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-
-PROG       = perl-Net-LibIDN
-DEPS       =
+PROG       = python3-urllib3
 PAK_VER    = 1
###############################################################################
@@ -43,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c3e4de2065009d67bcb1df0afb473e12
+$(DL_FILE)_MD5 = 2233256ccfe140a915f68703f8c2cc1f
install : $(TARGET)
@@ -53,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist:
+dist: 
    @$(PAK)
###############################################################################
@@ -76,8 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && perl Makefile.PL
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && python3 setup.py build
+	cd $(DIR_APP) && python3 setup.py install --root=/
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker
index 2bf34f590..063ef727e 100644
--- a/lfs/spectre-meltdown-checker
+++ b/lfs/spectre-meltdown-checker
@@ -24,7 +24,7 @@
include Config
-VER        = 0.43
+VER        = 0.44
THISAPP    = spectre-meltdown-checker-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spectre-meltdown-checker
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 05cd2e53edbdcccfc072a66fafa4ea38
+$(DL_FILE)_MD5 = 7bfa5b00ce9dc9400887b9bbb9748a22
install : $(TARGET)
diff --git a/lfs/strongswan b/lfs/strongswan
index d62a37c81..421541369 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER        = 5.9.0
+VER        = 5.9.1
THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 705628cddd5b7683ef8a688acd9514d8
+$(DL_FILE)_MD5 = 1f4db969d072e120dc12d1c116a0f658
install : $(TARGET)
diff --git a/lfs/suricata b/lfs/suricata
index f981232a2..2871d8e7b 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -24,7 +24,7 @@
include Config
-VER        = 5.0.4
+VER        = 6.0.0
THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,6 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	LDFLAGS += -latomic
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c08809d5641a790a95a56d4dc7eba2f2
+$(DL_FILE)_MD5 = bbddcf2f209930206ef21977d40120d2
install : $(TARGET)
@@ -70,7 +74,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure \
+	cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \
    	--prefix=/usr \
    	--sysconfdir=/etc \
    	--localstatedir=/var \
diff --git a/lfs/tor b/lfs/tor
index 956458407..6d758dcb0 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
include Config
-VER        = 0.4.4.5
+VER        = 0.4.4.6
THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 53
+PAK_VER    = 56
DEPS       = libseccomp
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b061b7c4ce6102fb7c800b73c8573388
+$(DL_FILE)_MD5 = 3635b2f7b6645910bf702ce8eaeffd0d
install : $(TARGET)
diff --git a/lfs/transmission b/lfs/transmission
index 6f52d6e5a..d9c82aaae 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 2.94
+VER        = 3.00
THISAPP    = transmission-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = transmission
-PAK_VER    = 16
+PAK_VER    = 17
DEPS       =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c92829294edfa391c046407eeb16358a
+$(DL_FILE)_MD5 = a23a32672b83c89b9b61e90408f53d98
install : $(TARGET)
diff --git a/lfs/tzdata b/lfs/tzdata
index a65136b6d..50457dbe9 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 2019c
+VER        = 2020d
 TZDATA_VER = $(VER)
 TZCODE_VER = $(VER)
@@ -33,8 +33,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-FILES      = africa antarctica asia australasia europe \
-	northamerica southamerica pacificnew etcetera backward
+FILES      = africa antarctica asia australasia backward etcetera europe \
+	factory northamerica southamerica
###############################################################################
 # Top-level Rules
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
 tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
 tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = f6987e6dfdb2eb83a1b5076a50b80894
-tzcode$(TZCODE_VER).tar.gz_MD5 = 195a17454c5db05cab96595380650391
+tzdata$(TZDATA_VER).tar.gz_MD5 = 2f58d72e31cf073f5076c2cbf182cba3
+tzcode$(TZCODE_VER).tar.gz_MD5 = b4c46a69e5894aac713e8365a9be9411
install : $(TARGET)
diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch
index c63ba395d..b3e19e6fb 100644
--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -24,7 +24,7 @@
include Config
-VER        = 2.5.2
+VER        = 2.6.1
THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 16b9a8efa1bf8fbd7d5612757eae4f26
+$(DL_FILE)_MD5 = 69d00d6ed7097b97d972a159d14cfba1
install : $(TARGET)
diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data
index 546a7a78c..0f5485d81 100644
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -24,7 +24,7 @@
include Config
-VER        = 20170806
+VER        = 20191128
THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fb50d15b52e909d742dd16f0a9882316
+$(DL_FILE)_MD5 = e8fce7eb949cbe16c61fb71bade4cc17
install : $(TARGET)
diff --git a/lfs/vdr b/lfs/vdr
index e40174e24..836983f50 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -24,11 +24,11 @@
include Config
-VER        = 2.4.1
+VER        = 2.4.4
# VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,7 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 11
+PAK_VER    = 12
DEPS       = vdr_streamdev
@@ -65,7 +65,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1
+$(DL_FILE)_MD5 = ccf724c157740b2b153ca41ad38f1217
install : $(TARGET)
@@ -98,8 +98,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	# stime was removed from glibc with version 2.31
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr/vdr-2.4.1_replace_stime.patch
# Compile main package.
    cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index 8be532f57..6d6dcf36a 100644
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -33,11 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_dvbapi
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
index 34ecdb30c..8a165012d 100644
--- a/lfs/vdr_eepg
+++ b/lfs/vdr_eepg
@@ -36,11 +36,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_eepg
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index 607030d30..9d1a9afc8 100644
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -33,11 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/vdr-plugin-epgsearch
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_epgsearch
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       =
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index 254203c23..b884e0328 100644
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -34,11 +34,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_streamdev
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       =
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
diff --git a/make.sh b/make.sh
index 9ddfd4c07..b17aca457 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"							# Version number
-CORE="152"							# Core Level (Filename)
+CORE="153"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
@@ -1239,6 +1239,7 @@ buildipfire() {
   lfsmake2 libffi
   lfsmake2 python
   lfsmake2 python3
+  lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar
   lfsmake2 efibootmgr
@@ -1417,9 +1418,6 @@ buildipfire() {
   lfsmake2 fetchmail
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
-  lfsmake2 spamassassin
-  lfsmake2 perl-Net-LibIDN
-  lfsmake2 amavisd
   lfsmake2 dma
   lfsmake2 alsa
   lfsmake2 mpfire
@@ -1563,6 +1561,7 @@ buildipfire() {
   lfsmake2 python3-s3transfer
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
+  lfsmake2 python3-urllib3
   lfsmake2 python3-botocore
   lfsmake2 python3-llfuse
   lfsmake2 python3-msgpack
@@ -1648,6 +1647,7 @@ buildipfire() {
   lfsmake2 libloc
   lfsmake2 ncdu
   lfsmake2 lshw
+  lfsmake2 socat
 }
buildinstaller() {
diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index 50b08cb96..4ef971f04 100644
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2020.05.07
-#	Date:    2020-05-07 03:15:02
+#	Version: 2020.10.25
+#	Date:    2020-10-25 03:15:01
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -42,6 +42,8 @@
    7a0b  SPI Controller
    7a0c  LPC Controller
    7a0f  DMA (Direct Memory Access) Controller
+# Found on some boards with two sockets
+	7a10  Hyper Transport Bridge Controller
    7a14  EHCI USB Controller
    7a15  Vivante GPU (Graphics Processing Unit)
    7a19  PCI-to-PCI Bridge
@@ -91,6 +93,8 @@
    1703  ISDN Adapter (PCI Bus, DV, W)
    1704  ISDN Adapter (PCI Bus, D, C)
 0721  Sapphire, Inc.
+0731  Jingjia Microelectronics Co Ltd
+	7200  JM7200 Series GPU
 0777  Ubiquiti Networks, Inc.
 0795  Wired Inc.
    6663  Butane II (MPEG2 encoder board)
@@ -270,6 +274,9 @@
    0013  53c875a
    	1000 1000  LSI53C875A PCI to Ultra SCSI Controller
    0014  MegaRAID Tri-Mode SAS3516
+		1000 9460  MegaRAID 9460-16i
+		1000 9480  MegaRAID 9480-8i8e
+		1000 9481  MegaRAID 9480-8e
    	1028 1f3a  PERC H745 Adapter
    	1028 1f3b  PERC H745 Front
    	1028 1fd4  PERC H745P MX
@@ -281,10 +288,15 @@
    	8086 9460  RAID Controller RSP3TD160F
    	8086 9480  RAID Controller RSP3MD088F
    0015  MegaRAID Tri-Mode SAS3416
+		1000 9441  MegaRAID 9440-16i
    	1028 1f3c  PERC H345 Adapter
    	1028 1f3d  PERC H345 Front
    	1d49 0503  ThinkSystem RAID 530-16i PCIe 12Gb Adapter
    0016  MegaRAID Tri-Mode SAS3508
+		1000 9461  MegaRAID 9460-8i
+		1000 9462  MegaRAID 9460-4i
+		1000 9463  MegaRAID 9365-28i
+		1000 9464  MegaRAID 9365-24i
    	1028 1fc9  PERC H840 Adapter
    	1028 1fcb  PERC H740P Adapter
    	1028 1fcd  PERC H740P Mini
@@ -295,6 +307,8 @@
    	8086 352f  Integrated RAID Module RMSP3HD080E
    	8086 9461  RAID Controller RSP3DD080F
    0017  MegaRAID Tri-Mode SAS3408
+		1000 9440  MegaRAID 9440-8i
+		1000 9442  MegaRAID 9440-4i
    	1d49 0500  ThinkSystem RAID 530-8i PCIe 12Gb Adapter
    	1d49 0502  ThinkSystem RAID 530-8i Dense Adapter
    	8086 3528  Integrated RAID RMSP3LD060
@@ -424,6 +438,7 @@
    	1000 9363  MegaRAID SAS 9361-4i
    	1000 9364  MegaRAID SAS 9364-8i
    	1000 936a  MegaRAID SAS 9364-8i
+		1000 9380  MegaRAID SAS 9380-8e
    	1028 1f41  PERC H830 Adapter
    	1028 1f42  PERC H730P Adapter
    	1028 1f43  PERC H730 Adapter
@@ -688,6 +703,8 @@
    	1d49 0200  ThinkSystem 430-8i SAS/SATA 12Gb HBA
    	1d49 0202  ThinkSystem 430-8e SAS/SATA 12Gb HBA
    	1d49 0204  ThinkSystem 430-8i SAS/SATA 12Gb Dense HBA
+# PCIe switch SES management endpoint
+	00b2  PEX880xx PCIe Gen 4 Switch SES management endpoint
    00be  SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC)
    00bf  SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC)
    00c0  SAS3324 PCI-Express Fusion-MPT SAS-3
@@ -695,6 +712,7 @@
    00c2  SAS3324 PCI-Express Fusion-MPT SAS-3
    00c3  SAS3324 PCI-Express Fusion-MPT SAS-3
    00c4  SAS3224 PCI-Express Fusion-MPT SAS-3
+		1170 0002  SAS3224 PCI Express to 12Gb HBA MEZZ CARD
    00c5  SAS3316 PCI-Express Fusion-MPT SAS-3
    00c6  SAS3316 PCI-Express Fusion-MPT SAS-3
    00c7  SAS3316 PCI-Express Fusion-MPT SAS-3
@@ -742,10 +760,14 @@
    	1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
    	1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
    00e6  Fusion-MPT 12GSAS/PCIe Secure SAS38xx
+		1000 4050  9500-16i Tri-Mode HBA
+		1000 4060  9500-8i Tri-Mode HBA
+		1000 4070  9500-16e Tri-Mode HBA
+		1000 4080  9500-8e Tri-Mode HBA
    	1028 200b  HBA355i Adapter
    	1028 200c  HBA355i Front
    	1028 200d  HBA355e Adapter
-		1028 200e  HBA355i MX
+		1028 200e  HBA350i MX
    	1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
    	1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
    00e7  Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
@@ -925,7 +947,7 @@
    13e9  Ariel
    1478  Navi 10 XL Upstream Port of PCI Express Switch
    1479  Navi 10 XL Downstream Port of PCI Express Switch
-	154c  Kryptos
+	154c  Kryptos [Radeon RX 350]
    154e  Garfield
    1551  Arlene
    1552  Pooky
@@ -953,9 +975,9 @@
    3154  RV380/M24 GL [Mobility FireGL V3200]
    3155  RV380 GL [FireMV 2400]
    3171  RV380 GL [FireMV 2400] (Secondary)
-	3e50  RV380 [Radeon X600]
+	3e50  RV380 [Radeon X550/X600]
    3e54  RV380 GL [FireGL V3200]
-	3e70  RV380 [Radeon X600] (Secondary)
+	3e70  RV380 [Radeon X550/X600] (Secondary)
    4136  RS100 [Mobility IGP 320M]
    4137  RS200 [Radeon IGP 340]
    4144  R300 [Radeon 9500]
@@ -1520,7 +1542,7 @@
    5044  All-In-Wonder 128 PCI
    	1002 0028  Rage 128 AIW
    	1002 0029  Rage 128 AIW
-	5046  Rage 4 [Rage 128 PRO AGP 4X TMDS]
+	5046  Rage 4 [Rage 128 PRO AGP 4X]
    	1002 0004  Rage Fury Pro
    	1002 0008  Rage Fury Pro/Xpert 2000 Pro
    	1002 0014  Rage Fury Pro
@@ -1530,9 +1552,9 @@
    	1002 0048  Rage Fury Pro
    	1002 2000  Rage Fury MAXX AGP 4x (TMDS) (VGA device)
    	1002 2001  Rage Fury MAXX AGP 4x (TMDS) (Extra device?!)
-	5050  Rage128 [Xpert 128 PCI]
+	5050  Rage 4 [Rage 128 PRO PCI / Xpert 128 PCI]
    	1002 0008  Xpert 128
-	5052  Rage 128 PRO AGP 4X TMDS
+	5052  Rage 4 [Rage 128 PRO AGP 4X]
    5144  R100 [Radeon 7200 / All-In-Wonder Radeon]
    	1002 0008  Radeon 7000/Radeon VE
    	1002 0009  Radeon 7000/Radeon
@@ -1631,8 +1653,6 @@
    524c  Rage 128 VR AGP
    	1002 0008  Xpert 99/Xpert 2000
    	1002 0088  Xpert 99
-	5346  Rage 128 SF/4x AGP 2x
-		1002 0048  RAGE 128 16MB VGA TVOUT AMC PAL
    534d  Rage 128 4X AGP 4x
    	1002 0008  Xpert 99/Xpert 2000
    	1002 0018  Xpert 2000
@@ -1659,7 +1679,7 @@
    554a  R423 [Radeon X800 XT Platinum Edition]
    554b  R423 [Radeon X800 GT/SE]
    	1002 0302  Radeon X800 SE
-	554d  R430 [Radeon X800 XL]
+	554d  R480 [Radeon X800 GTO2/XL]
    	1002 0322  All-In-Wonder X800 XL
    	1458 2124  GV-R80L256V-B (AGP)
    554e  R430 [All-In-Wonder X800 GT]
@@ -1668,7 +1688,7 @@
    5551  R423 GL [FireGL V5100]
    5569  R423 [Radeon X800 PRO] (Secondary)
    556b  R423 [Radeon X800 GT] (Secondary)
-	556d  R430 [Radeon X800 XL] (Secondary)
+	556d  R480 [Radeon X800 GTO2/XL] (Secondary)
    	1458 2125  GV-R80L256V-B (AGP)
    556f  R430 [Radeon X800] (Secondary)
    5571  R423 GL [FireGL V5100] (Secondary)
@@ -1719,7 +1739,7 @@
    5957  RX780/RX790 Host Bridge
    	1849 5957  A770CrossFire Motherboard
    5958  RD780 Host Bridge
-	5960  RV280 [Radeon 9200 PRO]
+	5960  RV280 [Radeon 9200 PRO / 9250]
    	17af 2020  Excalibur Radeon 9250
    5961  RV280 [Radeon 9200]
    	1002 2f72  All-in-Wonder 9200 Series
@@ -1888,7 +1908,7 @@
    	1642 3c81  Radeon HD 8670
    	1642 3c91  Radeon HD 8670
    	1642 3f09  Radeon R7 350
-	6611  Oland [Radeon HD 8570 / R7 240/340 / Radeon 520 OEM]
+	6611  Oland [Radeon HD 8570 / R5 430 OEM / R7 240/340 / Radeon 520 OEM]
    	1028 210b  Radeon R5 240 OEM
    	1642 1869  Radeon 520 OEM
    	174b 4248  Radeon R7 240 OEM
@@ -1910,6 +1930,7 @@
    	103c 0b0c  Bonaire [FirePro W4300]
    	103c 230c  FirePro W5100
    	13cc 3d2a  MXRT-5600
+	664d  Bonaire [FirePro W5100 / Barco MXRT-5600]
    6650  Bonaire
    6651  Bonaire
    6658  Bonaire XTX [Radeon R7 260X/360]
@@ -2568,6 +2589,7 @@
    67cc  Ellesmere [Polaris10]
    67cf  Ellesmere [Polaris10]
    67d0  Ellesmere [Radeon Pro V7300X / V7350x2]
+	67d7  Ellesmere [Radeon Pro WX 5100 / Barco MXRT-6700]
    67df  Ellesmere [Radeon RX 470/480/570/570X/580/580X/590]
    	1002 0b37  Radeon RX 480
    	1028 1722  Radeon RX 570X
@@ -2588,14 +2610,20 @@
    	1462 3413  Radeon RX 480 Gaming X 8GB
    	1462 3416  Radeon RX 570
    	1462 3418  Radeon RX 580 Armor 4G OC
+		1462 341b  Radeon RX 570 Armor 8G OC
    	1462 341e  Radeon RX 570 Armor 4G OC
    	1462 8a92  Radeon RX 580
    	148c 2372  Radeon RX 480 [Red Dragon]
    	148c 2373  Radeon RX 470
+		148c 2377  Red Devil RX 580 8G Golden
+# https://www.techpowerup.com/vgabios/?manufacturer=Powercolor&model=RX+58...
+		148c 2378  Radeon RX 580
+		148c 2379  Radeon RX 570 4G [Red Dragon]
    	1682 9470  Radeon RX 470
    	1682 9480  Radeon RX 480
    	1682 9588  Radeon RX 580 XTR
    	1682 c570  Radeon RX 570
+		1682 c580  Radeon RX 580
    	174b e347  Radeon RX 470/480
    	174b e349  Radeon RX 470
    	1787 a470  Radeon RX 470
@@ -2604,6 +2632,7 @@
    	1849 5030  Phantom Gaming D Radeon RX580 8G OC
    	1da2 e353  Radeon RX 570 Pulse 4GB
    	1da2 e366  Nitro+ Radeon RX 570/580/590
+		1da2 e387  Radeon RX 570 Pulse 4GB
    67e0  Baffin [Radeon Pro WX 4170]
    	103c 8270  Radeon Pro WX 4170
    	103c 8272  Radeon Pro WX 4170
@@ -2621,8 +2650,10 @@
    67e9  Baffin [Polaris11]
    67eb  Baffin [Radeon Pro V5300X]
    67ef  Baffin [Radeon RX 460/560D / Pro 450/455/460/555/555X/560/560X]
+		1025 1367  RX560X 4GB
    	1028 1703  RX 560D OEM OC 2 GB
    	103c 3421  Radeon RX 460
+		1043 0561  AREZ Radeon RX 560
    	106b 0160  Radeon Pro 460
    	106b 0166  Radeon Pro 455
    	106b 0167  Radeon Pro 450
@@ -2863,7 +2894,8 @@
    686c  Vega 10 [Radeon Instinct MI25 MxGPU]
    687f  Vega 10 XL/XT [Radeon RX Vega 56/64]
    	1002 0b36  RX Vega64
-		1002 6b76  RX Vega56
+		1002 6b76  RX Vega64
+		1458 230c  Radeon RX VEGA 56 GAMING OC 8G
    6880  Lexington [Radeon HD 6550M]
    	103c 163c  Pavilion dv6 Radeon HD 6550M
    6888  Cypress XT [FirePro V8800]
@@ -3362,7 +3394,8 @@
    6901  Topaz PRO [Radeon R5 M255]
    	103c 1318  Radeon R6 M255DX
    6907  Meso XT [Radeon R5 M315]
-	6921  Amethyst XT [Radeon R9 M295X]
+	6920  Amethyst [Radeon R9 M395/ M395X Mac Edition]
+	6921  Amethyst XT [Radeon R9 M295X / M390X]
    6929  Tonga XT GL [FirePro S7150]
    692b  Tonga PRO GL [FirePro W7100]
    	13cc 3d2b  MXRT-7600
@@ -3380,6 +3413,7 @@
    	148c 9380  Radeon R9 380
 # Make naming scheme consistent
    	174b e308  Radeon R9 380 Nitro 4G D5
+	693b  Tonga PRO GL [FirePro W7100 / Barco MXRT-7600]
    694c  Polaris 22 XT [Radeon RX Vega M GH]
    694e  Polaris 22 XL [Radeon RX Vega M GL]
    694f  Polaris 22 MGL XL [Radeon Pro WX Vega M GL]
@@ -3404,7 +3438,7 @@
    7100  R520 [Radeon X1800 XT]
    7101  R520/M58 [Mobility Radeon X1800 XT]
    7102  R520/M58 [Mobility Radeon X1800]
-	7104  R520 GL [FireGL V7200]
+	7104  R520 GL [FireGL V7200 / Barco MXTR-5100]
    	13cc 3d0a  MXRT-5100
    7109  R520 [Radeon X1800 XL]
    	1002 0322  All-in-Wonder X1800XL
@@ -3481,6 +3515,7 @@
    71c1  RV535 [Radeon X1650 PRO]
    	174b 0880  Radeon X1700 FSC
    71c2  RV530 [Radeon X1600 PRO]
+	71c3  RV530 [Radeon X1600 PRO]
    71c4  RV530/M56 GL [Mobility FireGL V5200]
    	17aa 2007  ThinkPad T60p
    71c5  RV530/M56-P [Mobility Radeon X1600]
@@ -3541,13 +3576,19 @@
    	1043 049e  Radeon R9 FURY
    	1043 04a0  Radeon R9 FURY X
    	174b e329  Radeon R9 FURY
-	7310  Navi 10
+	7310  Navi 10 [Radeon Pro W5700X]
    7312  Navi 10 [Radeon Pro W5700]
    731f  Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
+		1458 2313  Radeon RX 5700 XT Gaming OC
+		1da2 e411  Radeon RX 5600 XT
    7340  Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
    7341  Navi 14 [Radeon Pro W5500]
    7347  Navi 14 [Radeon Pro W5500M]
    734f  Navi 14 [Radeon Pro W5300M]
+	7360  Navi 12 [Radeon Pro 5600M]
+	73bf  Navi 21 [Radeon RX 6900 Series]
+	73c3  Navi 23
+	73df  Navi 22
    7833  RS350 Host Bridge
    7834  RS350 [Radeon 9100 PRO/XT IGP]
    7835  RS350M [Mobility Radeon 9000 IGP]
@@ -3743,6 +3784,7 @@
    9599  RV635 PRO [Radeon HD 3650 AGP]
    95c0  RV620 PRO [Radeon HD 3470]
    	1002 95c0  Mobility Radeon HD 3470
+		1028 3243  C120D
    95c2  RV620/M82 [Mobility Radeon HD 3410/3430]
    95c4  RV620/M82 [Mobility Radeon HD 3450/3470]
    	1002 95c4  Mobility Radeon HD 3400
@@ -3760,6 +3802,7 @@
    9612  RS780M [Mobility Radeon HD 3200]
    9613  RS780MC [Mobility Radeon HD 3100]
    9614  RS780D [Radeon HD 3300]
+	9615  RS780E [Radeon HD 3200]
    9616  RS780L [Radeon 3000]
    9640  Sumo [Radeon HD 6550D]
    9641  Sumo [Radeon HD 6620G]
@@ -3873,7 +3916,7 @@
    9917  Trinity [Radeon HD 7620G]
    9918  Trinity [Radeon HD 7600G]
    9919  Trinity [Radeon HD 7500G]
-	991e  Bishop
+	991e  Bishop [Xbox One S APU]
    9920  Liverpool [Playstation 4 APU]
    9921  Liverpool HDMI/DP Audio Controller
    9922  Starshp
@@ -4581,6 +4624,8 @@
    1466  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 6
    1467  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7
    1468  Zeppelin Cryptographic Coprocessor NTBCCP
+	1470  Vega 10 PCIe Bridge
+	1471  Vega 10 PCIe Bridge
    1480  Starship/Matisse Root Complex
    	1462 7c37  X570-A PRO motherboard
    1481  Starship/Matisse IOMMU
@@ -5195,6 +5240,7 @@
    0519  MGA 2064W [Millennium]
    051a  MGA 1064SG [Mystique]
    	102b 0100  MGA-1064SG Mystique
+		102b 051a  MGA-1164SG Mystique 220
    	102b 1100  MGA-1084SG Mystique
    	102b 1200  MGA-1084SG Mystique
    	1100 102b  MGA-1084SG Mystique
@@ -6678,24 +6724,24 @@
    	105d 0009  Imagine 128 series 2e 4Mb DRAM
    	105d 000a  Imagine 128 series 2 8Mb VRAM
    	105d 000b  Imagine 128 series 2 8Mb H-VRAM
-		11a4 000a  Barco Metheus 5 Megapixel
-		13cc 0000  Barco Metheus 5 Megapixel
-		13cc 0004  Barco Metheus 5 Megapixel
-		13cc 0005  Barco Metheus 5 Megapixel
-		13cc 0006  Barco Metheus 5 Megapixel
-		13cc 0008  Barco Metheus 5 Megapixel
-		13cc 0009  Barco Metheus 5 Megapixel
-		13cc 000a  Barco Metheus 5 Megapixel
-		13cc 000c  Barco Metheus 5 Megapixel
+		11a4 000a  Metheus 5 Megapixel
+		13cc 0000  Metheus 5 Megapixel
+		13cc 0004  Metheus 5 Megapixel
+		13cc 0005  Metheus 5 Megapixel
+		13cc 0006  Metheus 5 Megapixel
+		13cc 0008  Metheus 5 Megapixel
+		13cc 0009  Metheus 5 Megapixel
+		13cc 000a  Metheus 5 Megapixel
+		13cc 000c  Metheus 5 Megapixel
    493d  Imagine 128 T2R [Ticket to Ride]
-		11a4 000a  Barco Metheus 5 Megapixel, Dual Head
-		11a4 000b  Barco Metheus 5 Megapixel, Dual Head
-		13cc 0002  Barco Metheus 4 Megapixel, Dual Head
-		13cc 0003  Barco Metheus 5 Megapixel, Dual Head
-		13cc 0007  Barco Metheus 5 Megapixel, Dual Head
-		13cc 0008  Barco Metheus 5 Megapixel, Dual Head
-		13cc 0009  Barco Metheus 5 Megapixel, Dual Head
-		13cc 000a  Barco Metheus 5 Megapixel, Dual Head
+		11a4 000a  Metheus 5 Megapixel, Dual Head
+		11a4 000b  Metheus 5 Megapixel, Dual Head
+		13cc 0002  Metheus 4 Megapixel, Dual Head
+		13cc 0003  Metheus 5 Megapixel, Dual Head
+		13cc 0007  Metheus 5 Megapixel, Dual Head
+		13cc 0008  Metheus 5 Megapixel, Dual Head
+		13cc 0009  Metheus 5 Megapixel, Dual Head
+		13cc 000a  Metheus 5 Megapixel, Dual Head
    5348  Revolution 4
    	105d 0037  Revolution IV-FP AGP (For SGI 1600SW)
    	11a4 0028  PVS5600M
@@ -9423,7 +9469,7 @@
    	1682 211c  GeForce 6600 256MB DDR DUAL DVI TV
    00f3  NV43 [GeForce 6200]
    00f4  NV43 [GeForce 6600 LE]
-	00f5  G71 [GeForce 7800 GS]
+	00f5  G71 [GeForce 7800 GS AGP]
    00f6  NV43 [GeForce 6800 GS/XT]
    	1682 217e  XFX GeForce 6800 XTreme 256MB DDR3 AGP
    00f8  NV45GL [Quadro FX 3400/4400]
@@ -9818,15 +9864,16 @@
    02a0  NV2A [XGPU]
    02a5  MCPX CPU Bridge
    02a6  MCPX Memory Controller
-	02e0  G73 [GeForce 7600 GT]
+	02e0  G73 [GeForce 7600 GT AGP]
    	02e0 2249  GF 7600GT 560M 256MB DDR3 DUAL DVI TV
-	02e1  G73 [GeForce 7600 GS]
+	02e1  G73 [GeForce 7600 GS AGP]
    	1682 222b  PV-T73K-UAL3 (256MB)
    	1682 2247  GF 7600GS 512MB DDR2
-	02e2  G73 [GeForce 7300 GT]
-	02e3  G71 [GeForce 7900 GS]
-	02e4  G71 [GeForce 7950 GT]
+	02e2  G73 [GeForce 7300 GT AGP]
+	02e3  G71 [GeForce 7900 GS AGP]
+	02e4  G71 [GeForce 7950 GT AGP]
    	1682 2271  PV-T71A-YDF7 (512MB)
+	02e5  G71 [GeForce 7600 GS AGP]
    02f0  C51 Host Bridge
    	103c 2a34  Pavilion a1677c
    	103c 30b7  Presario V6133CL
@@ -10440,7 +10487,7 @@
    06eb  G98M [Quadro NVS 160M]
    06ec  G98M [GeForce G 105M]
    06ed  G98 [GeForce 9600 GT / 9800 GT]
-	06ee  G98 [GeForce 9600 GT / 9800 GT]
+	06ee  G98 [GeForce 9600 GT / 9800 GT / GT 240]
    06ef  G98M [GeForce G 103M]
    06f1  G98M [GeForce G 105M]
    06f8  G98 [Quadro NVS 420]
@@ -11020,6 +11067,7 @@
    0fd3  GK107M [GeForce GT 640M LE]
    0fd4  GK107M [GeForce GTX 660M]
    0fd5  GK107M [GeForce GT 650M Mac Edition]
+	0fd6  GK107M
    0fd8  GK107M [GeForce GT 640M Mac Edition]
    0fd9  GK107M [GeForce GT 645M]
    0fdb  GK107M
@@ -11036,6 +11084,7 @@
 # GRID K1 USM
    0fe7  GK107GL [GRID K100 vGPU]
    	10de 101e  GRID K100
+	0fe8  GK107M
    0fe9  GK107M [GeForce GT 750M Mac Edition]
    0fea  GK107M [GeForce GT 755M Mac Edition]
    0fec  GK107M [GeForce 710A]
@@ -11560,6 +11609,7 @@
    11a3  GK104M [GeForce GTX 680MX]
    	106b 010d  iMac 13,2
    11a7  GK104M [GeForce GTX 675MX]
+	11a9  GK104M [GeForce GTX 870M]
    11af  GK104GLM [GRID IceCube]
    11b0  GK104GL [GRID K240Q / K260Q vGPU]
    	10de 101a  GRID K240Q
@@ -11652,8 +11702,10 @@
    1287  GK208B [GeForce GT 730]
    1288  GK208B [GeForce GT 720]
    1289  GK208 [GeForce GT 710]
+	128a  GK208B
    128b  GK208B [GeForce GT 710]
    	1043 85f7  GT710-SL-1GD5
+	128c  GK208B
    1290  GK208M [GeForce GT 730M]
    	103c 2afa  GeForce GT 730A
    	103c 2b04  GeForce GT 730A
@@ -11770,6 +11822,7 @@
    13fb  GM204GLM [Quadro M5500]
    1401  GM206 [GeForce GTX 960]
    1402  GM206 [GeForce GTX 950]
+	1404  GM206 [GeForce GTX 960 FAKE]
    1406  GM206 [GeForce GTX 960 OEM]
    1407  GM206 [GeForce GTX 750 v2]
    1427  GM206M [GeForce GTX 965M]
@@ -11875,6 +11928,7 @@
    1c30  GP106GL [Quadro P2000]
    1c31  GP106GL [Quadro P2200]
    1c35  GP106
+	1c36  GP106
    1c60  GP106BM [GeForce GTX 1060 Mobile 6GB]
    	103c 8390  GeForce GTX 1060 Max-Q 6GB
    1c61  GP106BM [GeForce GTX 1050 Ti Mobile]
@@ -11947,12 +12001,12 @@
    1e04  TU102 [GeForce RTX 2080 Ti]
    1e07  TU102 [GeForce RTX 2080 Ti Rev. A]
    	1462 3715  RTX 2080 Ti GAMING X TRIO
-	1e2d  TU102B
-	1e2e  TU102B
+	1e2d  TU102 [GeForce RTX 2080 Ti Engineering Sample]
+	1e2e  TU102 [GeForce RTX 2080 Ti 12GB Engineering Sample]
    1e30  TU102GL [Quadro RTX 6000/8000]
    	10de 129e  Quadro RTX 8000
    	10de 12ba  Quadro RTX 6000
-	1e36  TU102GL
+	1e36  TU102GL [Quadro RTX 6000]
    1e37  TU102GL [GRID RTX T10-4/T10-8/T10-16]
    	10de 1347  GRID RTX T10-8
    	10de 1348  GRID RTX T10-4
@@ -11986,6 +12040,7 @@
    1ed0  TU104BM [GeForce RTX 2080 Mobile]
    1ed1  TU104BM [GeForce RTX 2070 SUPER Mobile / Max-Q]
    1ed3  TU104BM [GeForce RTX 2080 SUPER Mobile / Max-Q]
+	1ef5  TU104GLM [Quadro RTX 5000 Mobile Refresh]
    1f02  TU106 [GeForce RTX 2070]
    	1043 8673  TURBO RTX 2070
    1f04  TU106
@@ -11993,6 +12048,7 @@
    1f07  TU106 [GeForce RTX 2070 Rev. A]
    1f08  TU106 [GeForce RTX 2060 Rev. A]
    1f09  TU106 [GeForce GTX 1660 SUPER]
+	1f0a  TU106 [GeForce GTX 1650]
    1f10  TU106M [GeForce RTX 2070 Mobile]
    1f11  TU106M [GeForce RTX 2060 Mobile]
    1f12  TU106M [GeForce RTX 2060 Max-Q]
@@ -12005,28 +12061,63 @@
    1f50  TU106BM [GeForce RTX 2070 Mobile / Max-Q]
    1f51  TU106BM [GeForce RTX 2060 Mobile]
    1f54  TU106BM [GeForce RTX 2070 Mobile]
+	1f55  TU106BM [GeForce RTX 2060 Mobile]
+	1f76  TU106GLM [Quadro RTX 3000 Mobile Refresh]
    1f81  TU117
    1f82  TU117 [GeForce GTX 1650]
    1f91  TU117M [GeForce GTX 1650 Mobile / Max-Q]
    1f92  TU117M [GeForce GTX 1650 Mobile]
-	1f94  TU117M
+	1f94  TU117M [GeForce GTX 1650 Mobile]
    1f95  TU117M [GeForce GTX 1650 Ti Mobile]
    1f96  TU117M [GeForce GTX 1650 Mobile / Max-Q]
+	1f97  TU117M [GeForce MX450]
+	1f98  TU117M [GeForce MX450]
    1f99  TU117M
+	1f9c  TU117M [GeForce MX450]
    1fae  TU117GL
    1fb8  TU117GLM [Quadro T2000 Mobile / Max-Q]
    1fb9  TU117GLM [Quadro T1000 Mobile]
    1fbf  TU117GL
+	1fd9  TU117BM [GeForce GTX 1650 Mobile Refresh]
+	1ff9  TU117GLM [Quadro T1000 Mobile]
+	20b0  GA100 [A100 SXM4 40GB]
+	20b1  GA100 [A100 PCIe 40GB]
+	20be  GA100 [GRID A100A]
+	20bf  GA100 [GRID A100B]
+	20f1  GA100 [A100 PCIe 40GB]
    2182  TU116 [GeForce GTX 1660 Ti]
    2183  TU116
    2184  TU116 [GeForce GTX 1660]
    2187  TU116 [GeForce GTX 1650 SUPER]
+	2188  TU116 [GeForce GTX 1650]
    2191  TU116M [GeForce GTX 1660 Ti Mobile]
    2192  TU116M [GeForce GTX 1650 Ti Mobile]
    21ae  TU116GL
    21bf  TU116GL
    21c4  TU116 [GeForce GTX 1660 SUPER]
    21d1  TU116BM [GeForce GTX 1660 Ti Mobile]
+	2204  GA102 [GeForce RTX 3090]
+	2206  GA102 [GeForce RTX 3080 10GB / 20GB]
+		10de 146d  GA102 [GeForce RTX 3080 20GB]
+		1462 3892  RTX 3080 10GB GAMING X TRIO
+	222b  GA102 [GeForce RTX 3090 Engineering Sample]
+	222f  GA102 [GeForce RTX 3080 11GB / 12GB Engineering Sample]
+	2230  GA102GL [RTX A6000]
+	223f  GA102GL
+	2482  GA104 [GeForce RTX 3070 Ti]
+	2484  GA104 [GeForce RTX 3070 8GB / 16GB]
+		10de 146b  GA104 [GeForce RTX 3070]
+		10de 14ae  GA104 [GeForce RTX 3070 16GB]
+	2486  GA104 [GeForce RTX 3060 Ti]
+	249c  GA104M [GeForce RTX 3070 Mobile / Max-Q]
+	249d  GA104M [GeForce RTX 3070 Mobile / Max-Q]
+	24ac  GA104 [GeForce RTX 30x0 Engineering Sample]
+	24ad  GA104 [GeForce RTX 3060 Engineering Sample]
+	24af  GA104 [GeForce RTX 3070 Engineering Sample]
+	24bf  GA104 [GeForce RTX 3070 Engineering Sample]
+	24dc  GA104 [GeForce RTX 3070 16GB Engineering Sample]
+	252f  GA106 [GeForce RTX 3060 Engineering Sample]
+	25af  GA107 [GeForce RTX 3050 Engineering Sample]
 10df  Emulex Corporation
    0720  OneConnect NIC (Skyhawk)
    	103c 1934  FlexFabric 20Gb 2-port 650M Adapter
@@ -12427,6 +12518,7 @@
    	17aa b023  ThinkPad E595
    c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
    c822  RTL8822CE 802.11ac PCIe Wireless Network Adapter
+	c82f  RTL8822CE 802.11ac PCIe Wireless Network Adapter
    d723  RTL8723DE 802.11b/g/n PCIe Adapter
 10ed  Ascii Corporation
    7310  V7310
@@ -12448,6 +12540,7 @@
    3fc4  RME Digi9652 (Hammerfall)
    3fc5  RME Hammerfall DSP
    3fc6  RME Hammerfall DSP MADI
+	5005  Alveo U250
    7038  FPGA Card XC7VX690T
    	17aa 402f  FPGA XC7VX690T-3FFG1157E
    8380  Ellips ProfiXpress Profibus Master
@@ -13943,6 +14036,8 @@
    	1137 00ce  VIC 1225T PCIe Management Controller
    	1137 012e  VIC 1227 PCIe Management Controller
    	1137 014d  VIC 1385 PCIe Management Controller
+		1137 0217  VIC 1455 PCIe Management Controller
+		1137 0218  VIC 1457 PCIe Management Controller
    0043  VIC Ethernet NIC
    	1137 0047  VIC P81E PCIe Ethernet NIC
    	1137 0048  VIC M81KR Mezzanine Ethernet NIC
@@ -14473,6 +14568,16 @@
    	117c 00a2  Celerity FC-321E
    	117c 00a3  Celerity FC-322E
    	117c 00ac  Celerity FC-324E
+	00bb  Celerity FC 32/64Gb/s Gen 7 Fibre Channel HBA
+		117c 00bc  Celerity FC-321P
+		117c 00bd  Celerity FC-322P
+		117c 00be  Celerity FC-324P
+	00e6  ExpressSAS GT 12Gb/s SAS/SATA HBA
+		117c 00c0  ExpressSAS H1280 GT
+		117c 00c1  ExpressSAS H1208 GT
+		117c 00c2  ExpressSAS H1244 GT
+		117c 00c3  ExpressSAS H12F0 GT
+		117c 00c4  ExpressSAS H120F GT
    8013  ExpressPCI UL4D
    8014  ExpressPCI UL4S
    8027  ExpressPCI UL5D
@@ -14693,6 +14798,7 @@
    0314  Model 14 Road Runner Frame Grabber
    0324  Model 24 Road Runner Frame Grabber
    0344  Model 44 Road Runner Frame Grabber
+	b04e  Claxon CXP4 CoaXPress frame grabber
 118e  Hermstedt GmbH
 118f  Green Logic
 1190  Tripace
@@ -15690,6 +15796,11 @@
 125b  Asix Electronics Corporation
    1400  AX88141 Fast Ethernet Controller
    	1186 1100  AX8814X Based PCI Fast Ethernet Adapter
+	9100  AX99100 PCIe to Multi I/O Controller
+		a000 1000  Serial Port
+		a000 2000  Parallel Port
+		a000 6000  SPI
+		a000 7000  Local Bus
 125c  Aurora Technologies, Inc.
    0101  Saturn 4520P
    0640  Aries 16000P
@@ -15820,6 +15931,7 @@
    0811  SM811 LynxE
    0820  SM820 Lynx3D
    0910  SM910
+	2262  SM2262/SM2262EN SSD Controller
 1270  Olympus Optical Co., Ltd.
 1271  GW Instruments
 1272  Telematics International
@@ -17013,7 +17125,7 @@
 13c9  Eaton Corporation
 13ca  Iomega Corporation
 13cb  Yano Electric Co Ltd
-13cc  Metheus Corporation
+13cc  BARCO
 13cd  Compatible Systems Corporation
 13ce  Cocom A/S
 13cf  Studio Audio & Video Ltd
@@ -18134,6 +18246,7 @@
 144c  Catalina Research Inc
 144d  Samsung Electronics Co Ltd
    1600  Apple PCIe SSD
+	a544  Exynos 8890 PCIe Root Complex
    a800  XP941 PCIe SSD
    a802  NVMe SSD Controller SM951/PM951
    a804  NVMe SSD Controller SM961/PM961
@@ -18202,6 +18315,7 @@
    	1028 2097  EMC PowerEdge Express Flash Ent NVMe AGN SED RI U.2 Gen4 1.92TB
    	1028 2098  EMC PowerEdge Express Flash Ent NVMe AGN SED RI U.2 Gen4 3.84TB
    	1028 2099  EMC PowerEdge Express Flash Ent NVMe AGN SED RI U.2 Gen4 7.68TB
+	ecec  Exynos 8895 PCIe Root Complex
 144e  OLITEC
 144f  Askey Computer Corp.
 1450  Octave Communications Ind.
@@ -18885,6 +18999,7 @@
    16d5  BCM57407 NetXtreme-E 10GBase-T Ethernet Controller
    16d6  BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
    	14e4 4120  NetXtreme E-Series Advanced Dual-port 10Gb SFP+ Ethernet Network Daughter Card
+		14e4 4126  NetXtreme-E Dual-port 10G SFP+ Ethernet OCP 3.0 Adapter (BCM957412N4120C)
    	152d 8b20  BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
    	152d 8b22  BCM57412 NetXtreme-E 25Gb RDMA Ethernet Controller
    16d7  BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
@@ -18892,11 +19007,13 @@
    	14e4 1402  BCM957414A4142CC 10Gb/25Gb Ethernet PCIe
    	14e4 1404  BCM957414M4142C OCP 2x25G Type1 wRoCE
    	14e4 4140  NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card
+		14e4 4146  NetXtreme-E Dual-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957414N4140C)
    	1590 020e  Ethernet 25Gb 2-port 631SFP28 Adapter
    	1590 0211  Ethernet 25Gb 2-port 631FLR-SFP28 Adapter
    16d8  BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
    	1028 1feb  NetXtreme-E 10Gb SFP+ Adapter
-		14e4 4163  BCM957416M4163C OCP 2x10GBT Type1 wRoCE
+		14e4 4163  NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C)
+		14e4 4166  NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C)
    	1590 020c  Ethernet 10Gb 2-port 535T Adapter
    	1590 0212  Ethernet 10Gb 2-port 535FLR-T Adapter
    16d9  BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller
@@ -18913,6 +19030,7 @@
    16e7  BCM57404 NetXtreme-E Ethernet Partition
    16e8  BCM57406 NetXtreme-E Ethernet Partition
    16e9  BCM57407 NetXtreme-E 25Gb Ethernet Controller
+	16eb  BCM57412 NetXtreme-E RDMA Partition
    16ec  BCM57414 NetXtreme-E Ethernet Partition
    16ed  BCM57414 NetXtreme-E RDMA Partition
    16ee  BCM57416 NetXtreme-E Ethernet Partition
@@ -18945,8 +19063,16 @@
    	103c 30c0  Compaq 6710b
    	17aa 3a23  IdeaPad S10e
    1750  BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
+		14e4 2100  NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G)
+		14e4 5208  NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G)
    1751  BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
    1752  BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet
+	1800  BCM57502 NetXtreme-E Ethernet Partition
+	1801  BCM57504 NetXtreme-E Ethernet Partition
+	1802  BCM57508 NetXtreme-E Ethernet Partition
+	1803  BCM57502 NetXtreme-E RDMA Partition
+	1804  BCM57504 NetXtreme-E RDMA Partition
+	1805  BCM57508 NetXtreme-E RDMA Partition
    1806  BCM5750X NetXtreme-E Ethernet Virtual Function
    1807  BCM5750X NetXtreme-E RDMA Virtual Function
    3352  BCM3352
@@ -19124,6 +19250,8 @@
    43a1  BCM4360 802.11ac Wireless Network Adapter
    43a2  BCM4360 802.11ac Wireless Network Adapter
    43a3  BCM4350 802.11ac Wireless Network Adapter
+# Manufactured by Foxconn for Lenovo
+		17aa 075a  00JT494
    43a9  BCM43217 802.11b/g/n
    43aa  BCM43131 802.11b/g/n
    43ae  BCM43162 802.11ac Wireless Network Adapter
@@ -19148,6 +19276,9 @@
    4410  BCM4413 iLine32 HomePNA 2.0
    4411  BCM4413 V.90 56k modem
    4412  BCM4412 10/100BaseT
+	441f  BCM4361 802.11ac Dual-Band Wireless Network Controller
+	4420  BCM4361 802.11ac 2.4 GHz Wireless Network Controller
+	4421  BCM4361 802.11ac 5 GHz Wireless Network Controller
    4430  BCM44xx CardBus iLine32 HomePNA 2.0
    4432  BCM4432 CardBus 10/100BaseT
    4464  BCM4364 802.11ac Wireless Network Adapter
@@ -19667,7 +19798,8 @@
 1526  ISS, Inc
 1527  SOLECTRON
 1528  ACKSYS
-1529  AMERICAN MICROSystems Inc
+# nee American Microsystems Inc
+1529  ON Semiconductor
 152a  QUICKTURN DESIGN Systems
 152b  FLYTECH Technology CO Ltd
 152c  MACRAIGOR Systems LLC
@@ -19736,7 +19868,12 @@
    1100  PCI Express Core Reference Design
    110f  PCI Express Core Reference Design Virtual Function
    1110  XpressRich Reference Design
+	1111  XpressRich-AXI Ref Design
+	1112  QuickPCIe
    1113  XpressSwitch
+	1114  Inspector
+	1115  XpressLINK Ref Design
+	1116  XpressLINK-SOC Ref Design
    be00  PCI Express Bridge
 1557  MEDIASTAR Co Ltd
 1558  CLEVO/KAPOK Computer
@@ -19901,6 +20038,8 @@
    0215  MT42822 Family [BlueField-2 Secure Flash Recovery]
    0216  MT2894 Family [ConnectX-6 Lx Flash Recovery]
    0217  MT2894 Family [ConnectX-6 Lx Secure Flash Recovery]
+	0218  MT2910 Family [ConnectX-7 Flash Recovery]
+	0219  MT2910 Family [ConnectX-7 Secure Flash Recovery]
    021a  MT43162 Family [BlueField-3 Lx SoC Flash Recovery]
    021b  MT43162 Family [BlueField-3 Lx Secure Flash Recovery]
    021c  MT43244 Family [BlueField-3 SoC Flash Recovery]
@@ -19910,6 +20049,7 @@
    0250  Spectrum-3, Flash recovery mode
    0251  Spectrum-3, Secure Flash recovery mode
    0252  Amos chiplet
+	0253  Amos GearBox Manager
    0254  Spectrum-4, Flash recovery mode
    0255  Spectrum-4, Secure Flash recovery mode
    0256  Ofek chiplet
@@ -19918,8 +20058,6 @@
    0263  MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
    0264  Innova-2 Flex Burn image
    0281  NPS-600 Flash Recovery
-	0538  MT2910 Family [ConnectX-7 Flash Recovery]
-	0539  MT2910 Family [ConnectX-7 Secure Flash Recovery]
    1002  MT25400 Family [ConnectX-2 Virtual Function]
    1003  MT27500 Family [ConnectX-3]
    	1014 04b5  PCIe3 40GbE RoCE Converged Host Bus Adapter for Power
@@ -19992,11 +20130,13 @@
    1016  MT27710 Family [ConnectX-4 Lx Virtual Function]
    1017  MT27800 Family [ConnectX-5]
    	15b3 0006  ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT
+		15b3 0007  Mellanox ConnectX®-5 MCX516A-CCAT
    	15b3 0020  ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT
    	15b3 0068  ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN
    1018  MT27800 Family [ConnectX-5 Virtual Function]
    1019  MT28800 Family [ConnectX-5 Ex]
    	15b3 0008  ConnectX-5 Ex EN network interface card, 100GbE dual-port QSFP28, PCIe4.0 x16, tall bracket; MCX516A-CDAT
+		15b3 0125  Tencent ConnectX-5 EN Ex network interface card for OCP 3.0, with host management, 50GbE Dual-port QSFP28, PCIe4.0 x16, Thumbscrew (pull-tab) bracket
    101a  MT28800 Family [ConnectX-5 Ex Virtual Function]
    101b  MT28908 Family [ConnectX-6]
    101c  MT28908 Family [ConnectX-6 Virtual Function]
@@ -20113,8 +20253,11 @@
 15b7  Sandisk Corp
    2001  Skyhawk Series NVME SSD
    5001  WD Black NVMe SSD
-	5002  WD Black 2018/PC SN720 NVMe SSD
-	5003  WD Black 2018/PC SN520 NVMe SSD
+	5002  WD Black 2018 / PC SN720 NVMe SSD
+	5003  WD Black 2018 / PC SN520 NVMe SSD
+	5006  WD Black 2019/PC SN750 NVMe SSD
+	5009  WD Blue SN550 NVMe SSD
+		15b7 5009  WD Blue SN550 NVMe SSD
 15b8  ADDI-DATA GmbH
    1001  APCI1516 SP controller (16 digi outputs)
    1003  APCI1032 SP controller (32 digi inputs w/ opto coupler)
@@ -20412,9 +20555,14 @@
 167e  ONNTO Corp.
 1681  Hercules
 1682  XFX Pine Group Inc.
+	5701  Radeon 5700 XT Thicc III Ultra
    c580  Radeon RX 580
 1688  CastleNet Technology Inc.
    1170  WLAN 802.11b card
+168a  Utimaco IS GmbH
+	2086  CryptoServer Se-Series Hardware Security Module
+	c040  CryptoServer CSe-Series Hardware Security Module
+	c051  CryptoServer Se-Series Gen2 Hardware Security Module
 # nee Atheros Communications, Inc.
 168c  Qualcomm Atheros
    0007  AR5210 Wireless Network Adapter [AR5000 802.11a]
@@ -20652,6 +20800,8 @@
    0041  QCA6164 802.11ac Wireless Network Adapter
    0042  QCA9377 802.11ac Wireless Network Adapter
    	11ad 08a6  Qualcomm Atheros QCA9377 802.11ac Wireless Network Adapter
+# compatible with Lenovo's BIOS lock
+		17aa 0901  Qualcomm Atheros QCA9377 Wireless Network Adapter
    0046  QCA9984 802.11ac Wave 2 Wireless Network Adapter
    0050  QCA9887 802.11ac Wireless Network Adapter
    0207  AR5210 Wireless Network Adapter [AR5000 802.11a]
@@ -20879,11 +21029,32 @@
    0121  PCT-7303A PC card with IRC counters
    0122  PCT-7408A PC card with counters and timers
    0123  PCT-7424 PCI card with standard counters
+	0141  PCA7208AL - Analog Inputs/Outputs
+	0142  PCA7208AS - Analog inputs/Outputs
+	0143  PCA7408AL - Analog Inputs/Outputs
+	0144  PCA7408AS - Analog Inputs/Outputs
+	0145  PCA-7228AL Multifunction PCI IO card
+	0146  PCA-7228AS Multifunction PCI IO card
+	0147  PCA7428AL Multifunction PCI IO card
+	0148  PCA7428AS Multifunction PCI IO card
+	0149  PCA7228EL Multifunction PCI IO card with isolated analog inputs
+	0150  PCA7428EL Multifunction PCI IO card with isolated analog inputs
+	0151  PCA7628AL - PCI card with analog inputs, counters and DIO
+	0152  PCA7628AS PCI card with analog inputs, outputs, counters and DIO
+	0161  PCA7288A PCI card with analog outputs, counters and DIO
+	0180  PCI1052 Communication card for MicroUnit network
    0214  PCT-7424C (F0) PC card with standard counters
    0215  PCT-7424C (F1) PC card with standard counters
    0216  PCT-7424E (F0) PC card with standard counters
    0217  PCT-7424E (F1) PC card with standard counters
+	0240  PCA7428CL_F0 - analog Inputs
+	0241  PCA7428CL_F1 - analog Inputs
+	0242  PCA7428CS_F0 - Analog Inputs/Outputs non isolated
+	0243  PCA7428CS_F1 - Analog Inputs/Outputs non isolated
+	0244  PCA7428CE_F0 - Analog Inputs isolated
+	0245  PCA7428CE_F1 - Analog Inputs isolated
    0303  PCD-7006C Digital Input & Output PCI Card
+	0800  PCD8006 - PCIe digital Inputs/Outputs
    ff00  CTU CAN FD PCIe Card
 1761  Pickering Interfaces Ltd
 1771  InnoVISION Multimedia Ltd.
@@ -21061,6 +21232,7 @@
    8083  GL880 USB 1.1 UHCI controller
    8084  GL880 USB 2.0 EHCI controller
    9750  GL9750 SD Host Controller
+	e763  GL9763E eMMC Controller
 17aa  Lenovo
    402b  Intel 82599ES 10Gb 2-port Server Adapter X520-2
 17ab  Phillips Components
@@ -21083,8 +21255,14 @@
    0002  AGN300 802.11 a/b/g True MIMO Wireless Card
    	1385 6d00  WPNT511 RangeMax 240 Mbps Wireless CardBus Adapter
    	1737 0054  WPC54GX4 v1 802.11g Wireless-G Notebook Adapter with SRX400
+	0105  MSM8998 PCIe Root Complex
+	0108  SM8150/SA8195P PCIe Root Complex
+	0300  MDM9x35 LTE Modem
+	0301  MDM9640 PCIe Root Complex
+	0302  MDM9x55 LTE Modem [Snapdragon X12]
    0400  Datacenter Technologies QDF2432 PCI Express Root Port
    0401  Datacenter Technologies QDF2400 PCI Express Root Port
+	1000  QCS405 PCIe Root Complex
 17cc  NetChip Technology, Inc
    2280  USB 2.0
 17cd  Cadence Design Systems, Inc.
@@ -21842,7 +22020,7 @@
    0087  MPC8343
    00b4  MPC8315E
    00b6  MPC8314E
-		1a56 1101  Killer Xeno Pro Gigabit Ethernet Controller
+		1a56 1101  Bigfoot Killer Xeno Pro Gigabit Ethernet Controller
    00c2  MPC8379E
    00c3  MPC8379
    00c4  MPC8378E
@@ -21881,7 +22059,7 @@
    7011  MPC8641D PCI Host Bridge
    7018  MPC8610
    c006  MPC8308
-		1a56 1201  Killer E2100 Gigabit Ethernet Controller
+		1a56 1201  Bigfoot Killer E2100 Gigabit Ethernet Controller
 # PCIe interface for emulator
    fc02  RedStone
 # CFI device over PCIe
@@ -21905,6 +22083,11 @@
 1966  Orad Hi-Tec Systems
    1975  DVG64 family
    1977  DVG128 family
+	1979  3DVG/UHD3
+	1980  HDV2/UHD2
+		1234 3160  UHD2LC
+		1234 3300  Legacy UHD2
+		1234 3410  UHD2
 # nee Atheros Communications, Inc. nee Attansic Technology Corp.
 1969  Qualcomm Atheros
    1026  AR8121/AR8113/AR8114 Gigabit or Fast Ethernet
@@ -21946,6 +22129,8 @@
 1974  Star Electronics GmbH & Co. KG
    0009  FlexCard PMC-II
    0011  FlexCard PMC-II Ethernet
+	0018  FlexCard PXIe3
+	0019  FlexCard PCIe3
 1976  TRENDnet
 1977  Parsec
 197b  JMicron Technology Corp.
@@ -22071,10 +22256,13 @@
    0200  Hi1822 Family (2*100GE)
    	19e5 d139  Hi1822 SP572 (2*100GE)
    	19e5 d13d  Hi1822 SC371 (2*100GE)
+		19e5 d147  Hi1822 SP573 (2*100GE)
    0202  Hi1822 Family (2*32G FC)
+		19e5 d149  Hi1822 SP528 (2*32G FC)
    	19e5 d302  Hi1822 SP521 (2*32G FC)
    	19e5 d304  Hi1822 SP526 (2*32G FC)
    0203  Hi1822 Family (2*16G FC)
+		19e5 d148  Hi1822 SP527 (2*16G FC)
    	19e5 d301  Hi1822 SP520 (2*16G FC)
    	19e5 d305  Hi1822 SP525 (2*16G FC)
    0205  Hi1822 Family (2*100GE)
@@ -22082,6 +22270,7 @@
    0206  Hi1822 Family (2*25GE)
    	19e5 d138  Hi1822 SP582 (2*25GE)
    	19e5 d13a  Hi1822 SC381 (2*25GE)
+		19e5 d145  Hi1822 SP586 (2*25GE)
    0210  Hi1822 Family (4*25GE)
    	19e5 df2e  Hi1822 MZ532 MEZZ (4*25GE)
    0211  Hi1822 Family (4*25GE)
@@ -22097,6 +22286,7 @@
    	19e5 d129  Hi1822 SP570 (4*25GE)
    	19e5 d136  Hi1822 SP580 (4*25GE)
    	19e5 d141  Hi1822 SP583 (4*25GE)
+		19e5 d146  Hi1822 SP585 (4*25GE)
    371e  Hi1822 Family Virtual Bridge
    375e  Hi1822 Family Virtual Function
    379e  Hi1822 Family Virtual Function
@@ -22155,6 +22345,7 @@
    0009  CAN interface PCI104 HS/HS
 1a08  Sierra semiconductor
    0000  SC15064
+1a0d  SEAKR Engineering
 1a0e  DekTec Digital Video B.V.
    083f  DTA-2111 VHF/UHF Modulator
 1a17  Force10 Networks, Inc.
@@ -22216,7 +22407,8 @@
    0065  Atomix HDMI STAN
    0070  RED Rocket
    0090  CinePlay
-1a56  Bigfoot Networks, Inc.
+# nee Bigfoot Networks, now owned by Intel
+1a56  Rivet Networks
 1a57  Highly Reliable Systems
 1a58  Razer USA Ltd.
 1a5d  Celoxica
@@ -22274,14 +22466,63 @@
    	4254 0552  S952 v3
 1ae0  Google, Inc.
    0042  Compute Engine Virtual Ethernet [gVNIC]
+	abcd  Airbrush Combined Paintbox IPU/Oscar Edge TPU [Pixel Neural Core]
 1ae3  SANBlaze Technology, Inc.
 1ae7  First Wise Media GmbH
    0520  HFC-S PCI A [X-TENSIONS XC-520]
 1ae8  Silicon Software GmbH
-	0a40  microEnable IV-BASE x1
-	0a41  microEnable IV-FULL x1
-	0a44  microEnable IV-FULL x4
-	0e44  microEnable IV-GigE x4
+# CameraLink frame grabber for Visual Applets
+	0751  mE5 marathon VCL
+# CameraLink HS frame grabber
+	0752  mE5 marathon AF2
+# CoaXpress frame grabber
+	0753  mE5 marathon ACX QP
+# CameraLink frame grabber
+	0754  mE5 marathon ACL
+# CoaXpress frame grabber
+	0755  mE5 marathon ACX SP
+# CoaXpress frame grabber
+	0756  mE5 marathon ACX DP
+# CoaXpress frame grabber for Visual Applets
+	0757  mE5 marathon VCX QP
+# CameraLink HS frame grabber for Visual Applets
+	0758  mE5 marathon VF2
+# CameraLink frame grabber for Visual Applets / AI applications
+	0759  mE5 marathon VCLx
+# CameraLink frame grabber
+	0a40  microEnable IV AD1-CL
+# CameraLink frame grabber for Visual Applets
+	0a41  microEnable IV VD1-CL
+# CameraLink frame grabber
+	0a42  microEnable IV AD4-CL
+# CameraLink frame grabber for Visual Applets
+	0a44  microEnable IV VD4-CL
+# CameraLink frame grabber
+	0a45  microEnable IV AS1-CL
+# CoaXpress frame grabber
+	0a53  microEnable 5 AQ8-CXP6B
+# CoaXpress frame grabber for Visual Applets
+	0a54  microEnable 5 VQ8-CXP6B
+# CoaXpress frame grabber for Visual Applets
+	0a56  microEnable 5 VQ8-CXP6D
+# CoaXpress frame grabber
+	0a57  microEnable 5 AQ8-CXP6D
+# CameraLink frame grabber for Visual Applets
+	0a58  microEnable 5 VD8-CL
+# CameraLink frame grabber
+	0a5a  microEnable 5 AD8-CL
+# OEM product
+	0b52  mE5 Abacus 4G Base
+# OEM product
+	0b53  mE5 Abacus 4G Base II
+# OEM product
+	0b61  mE6 Abacus 4TG
+# CoaXpress frame grabber
+	0b63  CXP-12 Interface Card 1C
+# GigE Vision frame grabber
+	0e42  microEnable IV AQ4-GE
+# GigE Vision frame grabber for Visual Applets
+	0e44  microEnable IV VQ4-GE
 1ae9  Wilocity Ltd.
    0101  Wil6200 PCI Express Upstream Port
    0200  Wil6200 PCI Express Port
@@ -22340,6 +22581,8 @@
    1050  Virtio GPU
 # virtio 1.0
    1052  Virtio input
+# virtio 1.0
+	1053  Virtio socket
    1110  Inter-VM shared memory
    	1af4 1100  QEMU Virtual Machine
 1af5  Netezza Corp.
@@ -22357,6 +22600,7 @@
    0612  ASM1062 Serial ATA Controller
    	1849 0612  Motherboard
    1042  ASM1042 SuperSpeed USB Host Controller
+		1043 1059  K53SM motherboard
    	1043 8488  P8B WS Motherboard
    	1849 1042  Motherboard
    1080  ASM1083/1085 PCIe to PCI Bridge
@@ -22367,6 +22611,7 @@
    1242  ASM1142 USB 3.1 Host Controller
    1343  ASM1143 USB 3.1 Host Controller
    2142  ASM2142 USB 3.1 Host Controller
+	3242  ASM3242 USB 3.2 Host Controller
 1b26  Netcope Technologies, a.s.
    c132  COMBO-LXT155
    c1c0  NFB-100G1-e0
@@ -22432,6 +22677,9 @@
    0602  NumaChip N602
 1b4b  Marvell Technology Group Ltd.
    0640  88SE9128 SATA III 6Gb/s RAID Controller
+	2241  88NR2241 Non-Volatile memory controller
+		1d49 0306  ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit
+		1d49 0307  ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit
    9120  88SE9120 SATA 6Gb/s Controller
    9123  88SE9123 PCIe SATA 6.0 Gb/s controller
    	dc93 600e  DC-6xxe series SATA 6G controller
@@ -22453,10 +22701,16 @@
    	1028 1fe2  BOSS-S1 Adapter
    	1028 2010  BOSS-S2 Adapter
    	1d49 0300  ThinkSystem M.2 with Mirroring Enablement Kit
+		1d49 0301  ThinkSystem SR630 x16 PCIE with 4 SATA ports Riser
+		1d49 0302  ThinkSystem SE350 M.2 SATA 4-Bay Data RAID Mirroring Enablement Kit
+		1d49 0303  ThinkSystem SE350 M.2 SATA 4-Bay Data RAID Mirroring Enablement Kit
+		1d49 0304  ThinkSystem M.2 SATA 2-Bay RAID Enablement Kit
+		1d49 0305  ThinkSystem 7mm SATA 2-Bay Rear RAID Enablement Kit
    9235  88SE9235 PCIe 2.0 x2 4-port SATA 6 Gb/s Controller
    9445  88SE9445 PCIe 2.0 x4 4-Port SAS/SATA 6 Gbps RAID Controller
    9480  88SE9480 SAS/SATA 6Gb/s RAID controller
    9485  88SE9485 SAS/SATA 6Gb/s controller
+1b4c  GALAX
 1b55  NetUP Inc.
    18f6  Dual DVB Universal CI card
    18f7  Dual DVB Universal CI card rev 1.4
@@ -22635,8 +22889,12 @@
    a00a  FBC2CGG3 Capture 8x10Gb [Mango]
    a00e  FB2CG Capture 2x100Gb [Savona]
    a00f  FB2CG Capture 2x40Gb [Savona]
+	a010  FB2CGHH Capture 2x40Gb [Tivoli]
    a011  FB2CG Capture 2x25Gb [Savona]
    a012  FB2CG Capture 8x10Gb [Savona]
+	a013  FB2CGHH Capture 2x25Gb [Tivoli]
+	a014  FB2CGHH Capture 8x10Gb [Tivoli]
+	a015  FB2CGHH Capture 2x100Gb [Tivoli]
 # Used on V120 VME Crate Controller
 1c32  Highland Technology, Inc.
 1c33  Daktronics, Inc
@@ -22663,6 +22921,10 @@
    1285  PC300 NVMe Solid State Drive 1TB
    1327  BC501 NVMe Solid State Drive 512GB
    1504  SC300 512GB M.2 2280 SATA Solid State Drive
+	243b  PE6110 NVMe Solid State Drive
+		1c5c 0100  PE6110 NVMe Solid State Drive
+	2839  PE8000 Series NVMe Solid State Drive
+		1c5c 0100  PE8000 Series NVMe Solid State Drive
 1c5f  Beijing Memblaze Technology Co. Ltd.
    000d  PBlaze5 520/526 AIC
    003d  PBlaze5 920/926 AIC
@@ -22685,12 +22947,21 @@
 1c8c  Mobiveil, Inc.
 1cb0  Shannon Systems
    d000  Venice NVMe SSD
-		1cb0 2f10  Venice-E Series U.2 SSD
-		1cb0 2f11  Venice Series U.2 SSD
-		1cb0 2f12  Venice-X Series U.2 SSD
-		1cb0 af10  Venice-E Series AIC SSD
-		1cb0 af11  Venice Series AIC SSD
-		1cb0 af12  Venice-X Series AIC SSD
+		1cb0 2010  Venice-E Series OCS U.2
+		1cb0 2011  Venice Series OCS U.2
+		1cb0 2012  Venice-X Series OCS U.2
+# Venice-E Series NVMe U.2 SSD(1.92T/3.84T/7.68T)
+		1cb0 2f10  Venice-E Series NVMe U.2
+# Venice Series NVMe U.2 SSD(2T/4T/8T)
+		1cb0 2f11  Venice Series NVMe U.2
+# Venice-X Series NVMe U.2 SSD(1.6T/3.2T/6.4T)
+		1cb0 2f12  Venice-X Series NVMe U.2
+		1cb0 a010  Venice-E Series OCS AIC
+		1cb0 a012  Venice-X Series OCS AIC
+# Venice-E Series NVMe AIC SSD(1.92T/3.84T/7.68T)
+		1cb0 af10  Venice-E Series NVMe AIC
+# Venice-X Series NVMe AIC SSD(1.6T/3.2T/6.4T)
+		1cb0 af12  Venice-X Series NVMe AIC
 1cb1  Collion UG & Co.KG
 1cb5  Focusrite Audio Engineering Ltd
    0002  Clarett
@@ -22744,6 +23015,7 @@
    cd01  NVMe SSD Controller
    ec20  Elastic Network Adapter (ENA)
    efa0  Elastic Fabric Adapter (EFA)
+	efa1  Elastic Fabric Adapter (EFA)
 1d17  Zhaoxin
    070f  ZX-100 PCI Express Root Port
    0710  ZX-100/ZX-200 PCI Express Root Port
@@ -22868,9 +23140,24 @@
    1012  AR-MAN-U200 [Manitou Class Accelerator for U200]
    1013  AR-MAN-U250 [Manitou Class Accelerator for U250]
    1014  AR-MAN-U280 [Manitou Class Accelerator for U280]
+	1015  AR-ARK-BBDEV-FX0 [Arkville 32B DPDK Baseband Device]
+	1016  AR-ARK-BBDEV-FX1 [Arkville 64B DPDK Baseband Device]
    4200  A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
 1d72  Xiaomi
-1d78  DERA
+1d78  DERA Storage
+	1512  TAI NVMe Controller
+		1d78 2004  D5437 HHHL 2TB NVMe SSD
+		1d78 2006  D5437 HHHL 4TB NVMe SSD
+		1d78 2008  D5437 HHHL 8TB NVMe SSD
+		1d78 2104  D5437 U.2 2TB NVMe SSD
+		1d78 2106  D5437 U.2 4TB NVMe SSD
+		1d78 2108  D5437 U.2 8TB NVMe SSD
+		1d78 3003  D5457 HHHL 1.6TB NVMe SSD
+		1d78 3005  D5457 HHHL 3.2TB NVMe SSD
+		1d78 3007  D5457 HHHL 6.4TB NVMe SSD
+		1d78 3103  D5457 U.2 1.6TB NVMe SSD
+		1d78 3105  D5457 U.2 3.2TB NVMe SSD
+		1d78 3107  D5457 U.2 6.4TB NVMe SSD
 1d7c  Aerotech, Inc.
 1d82  NETINT Technologies Inc.
    0101  Codensity D400 SSD
@@ -22914,6 +23201,7 @@
 1d95  Graphcore Ltd
    0001  Colossus GC2 [C2]
    0002  Colossus GC1 [S1]
+1d97  Shenzhen Longsys Electronics Co., Ltd.
 1d9b  Facebook, Inc.
    0010  Networking DOM Engine
    0011  IO Bridge
@@ -22923,42 +23211,67 @@
    0001  HL-1000 AI Inference Accelerator [Goya]
 # PCIe accelerator card for Deep Learning training tasks
    1000  HL-2000 AI Training Accelerator [Gaudi]
+1db2  ATP ELECTRONICS INC
 1dbb  NGD Systems, Inc.
 1dbf  Guizhou Huaxintong Semiconductor Technology Co., Ltd
    0401  StarDragon4800 PCI Express Root Port
 1dc5  FADU Inc.
 1dcd  Liqid Inc.
-1dd8  Pensando Systems Inc
+1dd8  Pensando Systems
    1000  DSC Capri Upstream Port
    	1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
    	1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
    	1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
+		1dd8 4007  DSP DSC-25 10/25G 2p OCP Card
    	1dd8 4008  DSC-25 10/25G 2-port SFP28 x8 4GB RAM 8GB eMMC
+		1dd8 400a  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 400d  DSP DSC-100 100G 2p QSFP28 Card
    1001  DSC Virtual Downstream Port
    	1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
    	1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
    	1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
+		1dd8 4007  DSP DSC-25 10/25G 2p OCP Card
    	1dd8 4008  DSC-25 10/25G 2-port SFP28 x8 4GB RAM 8GB eMMC
+		1dd8 400a  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 400d  DSP DSC-100 100G 2p QSFP28 Card
    1002  DSC Ethernet Controller
    	1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
    	1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
    	1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
+		1dd8 4007  DSP DSC-25 10/25G 2p OCP Card
    	1dd8 4008  DSC-25 10/25G 2-port SFP28 x8 4GB RAM 8GB eMMC
+		1dd8 400a  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 400d  DSP DSC-100 100G 2p QSFP28 Card
    1003  DSC Ethernet Controller VF
    	1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
    	1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
    	1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
+		1dd8 4007  DSP DSC-25 10/25G 2p OCP Card
    	1dd8 4008  DSC-25 10/25G 2-port SFP28 x8 4GB RAM 8GB eMMC
+		1dd8 400a  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 400d  DSP DSC-100 100G 2p QSFP28 Card
    1004  DSC Management Controller
    	1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
    	1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
    	1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
+		1dd8 4007  DSP DSC-25 10/25G 2p OCP Card
    	1dd8 4008  DSC-25 10/25G 2-port SFP28 x8 4GB RAM 8GB eMMC
+		1dd8 400a  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 400d  DSP DSC-100 100G 2p QSFP28 Card
    1007  DSC Storage Accelerator
    	1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
    	1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
    	1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
+		1dd8 4007  DSP DSC-25 10/25G 2p OCP Card
    	1dd8 4008  DSC-25 10/25G 2-port SFP28 x8 4GB RAM 8GB eMMC
+		1dd8 400a  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 400d  DSP DSC-100 100G 2p QSFP28 Card
 1de0  Groq
    0000  Q100 Tensor Streaming Processor
 1de1  Tekram Technology Co.,Ltd.
@@ -22969,6 +23282,8 @@
 1de5  Eideticom, Inc
    1000  IO Memory Controller
    2000  NoLoad Hardware Development Kit
+	3000  eBPF-based PCIe Accelerator
+1dee  Biwin Storage Technology Co., Ltd.
 1def  Ampere Computing, LLC
    e005  eMAG PCI Express Root Port 0
    e006  eMAG PCI Express Root Port 1
@@ -22995,6 +23310,12 @@
    0204  ACE-NIC-NID Programmable Network Accelerator
    	1df3 0001  ENA1020Z
    	1df3 0002  ENA1020ZS
+	0205  ACE-NIC250 Programmable Network Accelerator
+		1df3 0000  Maintenance Mode
+		1df3 0001  ENA2250F
+	0206  ACE-NIC200 Programmable Network Accelerator
+		1df3 0000  Maintenance Mode
+		1df3 0001  ENA2200F
 1df7  opencpi.org
    0001  ml605
    0002  alst4
@@ -23003,6 +23324,26 @@
    1181  TDM 8 Port E1/T1/J1 Adapter
 1e0f  KIOXIA Corporation
    0007  NVMe SSD Controller Cx6
+		1028 2078  DC NVMe CD6 RI 960GB
+		1028 2079  DC NVMe CD6 RI 1.92TB
+		1028 207a  DC NVMe CD6 RI 3.84TB
+		1028 207b  DC NVMe CD6 RI 7.68TB
+		1028 207c  DC NVMe CD6 RI 15.36TB
+		1028 207e  Dell Ent NVMe CM6 RI 1.92TB
+		1028 207f  Dell Ent NVMe CM6 RI 3.84TB
+		1028 2080  Dell Ent NVMe CM6 RI 7.68TB
+		1028 2081  Dell Ent NVMe CM6 RI 15.36TB
+		1028 2084  Dell Ent NVMe CM6 MU 1.6TB
+		1028 2085  Dell Ent NVMe CM6 MU 3.2TB
+		1028 2086  Dell Ent NVMe CM6 MU 6.4TB
+		1028 210a  Dell Ent NVMe FIPS CM6 RI 1.92TB
+		1028 210b  Dell Ent NVMe FIPS CM6 RI 3.84TB
+		1028 210c  Dell Ent NVMe FIPS CM6 RI 7.68TB
+		1028 210d  Dell Ent NVMe FIPS CM6 RI15.36TB
+		1028 210e  Dell Ent NVMe FIPS CM6 MU 1.6TB
+		1028 210f  Dell Ent NVMe FIPS CM6 MU 3.2TB
+		1028 2110  Dell Ent NVMe FIPS CM6 MU 6.4TB
+		1e0f 0001  Generic NVMe CM6 RI 3.84TB
 1e17  Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
 1e24  Squirrels Research Labs
    0101  Acorn CLE-101
@@ -23020,22 +23361,37 @@
    0001  T10 [CloudBlazer]
 # nee Thinci, Inc
 1e38  Blaize, Inc
+	0102  Xplorer X1600
 1e3d  Burlywood, Inc
 1e49  Yangtze Memory Technologies Co.,Ltd
+1e4b  MAXIO Technology (Hangzhou) Ltd.
+	1001  NVMe SSD Controller MAP1001
+	1002  NVMe SSD Controller MAP1002
+	1003  NVMe SSD Controller MAP1003
+	1201  NVMe SSD Controller MAP1201
+	1202  NVMe SSD Controller MAP1202
+	1601  NVMe SSD Controller MAP1601
 1e4c  GSI Technology
-# Associative Processing Unit chip
-	0010  Gemini [ Lida ]
+# Associative Processing Unit (APU)
+	0010  APU [Leda-G]
    	1e4c 0120  SE120
 1e57  Beijing Panyi Technology Co., Ltd
    0100  The device has already been deleted.
    	0000 0100  PY8800 64GB Accelerator
 1e6b  Axiado Corp.
+1e7b  Dataland
+1e7c  Brainchip Inc
+	bca1  AKD1000 Neural Network Coprocessor [Akida]
 1e85  Heitec AG
 1e89  ID Quantique SA
    0002  Quantis-PCIe-40M
    0003  Quantis-PCIe-240M
 # aka SED Systems
 1e94  Calian SED
+1e95  Solid State Storage Technology Corporation
+1eae  XFX Limited
+1eb1  VeriSilicon Inc
+	1001  Video Accelerator
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
    0300  E2200 Dual E1/Rawpipe Card
@@ -23117,6 +23473,7 @@
 2348  Racore
    2010  8142 100VG/AnyLAN
 2646  Kingston Technology Company, Inc.
+	2263  A2000, M.2, 500GB
 270b  Xantel Corporation
 270f  Chaintech Computer Co. Ltd
 2711  AVID Technology Inc.
@@ -23162,7 +23519,7 @@
 3442  Bihl+Wiedemann GmbH
    1783  AS-i 3.0 cPCI Master
    1922  AS-i 3.0 PCI Master
-3475  Arastra Inc.
+3475  Arista Networks, Inc.
 3513  ARCOM Control Systems Ltd
 37d9  ITD Firm ltd.
    1138  SCHD-PH-8 Phase detector
@@ -23217,6 +23574,7 @@
    0100  Permedia II 2D+3D
    07a1  Wildcat III 6210
    07a2  Sun XVR-500 Graphics Accelerator
+		3d3d 1047  Sun XVR-600 Graphics Accelerator
    07a3  Wildcat IV 7210
    1004  Permedia
    3d04  Permedia
@@ -23945,13 +24303,22 @@
    	1043 844d  P8B WS Motherboard
    0172  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
    0176  3rd Gen Core processor Graphics Controller
+	0284  Comet Lake PCH-LP LPC Premium Controller/eSPI Controller
+	02a3  Comet Lake PCH-LP SMBus Host Controller
    02a4  Comet Lake SPI (flash) Controller
    02a6  Comet Lake North Peak
+	02c8  Comet Lake PCH-LP cAVS
    02d3  Comet Lake SATA AHCI Controller
    02e0  Comet Lake Management Engine Interface
    02e8  Serial IO I2C Host Controller
    02e9  Comet Lake Serial IO I2C Host Controller
-	02f0  Wireless-AC 9462
+	02ed  Comet Lake PCH-LP USB 3.1 xHCI Host Controller
+	02ef  Comet Lake PCH-LP Shared SRAM
+	02f0  Comet Lake PCH-LP CNVi WiFi
+		8086 0034  Wireless-AC 9560 160MHz
+		8086 0070  Wi-Fi 6 AX201 160MHz
+		8086 0074  Wi-Fi 6 AX201 160MHz
+	02f5  Comet Lake PCH-LP SCS3
    02f9  Comet Lake Thermal Subsytem
    02fc  Comet Lake Integrated Sensor Solution
    0309  80303 I/O Processor PCI-to-PCI Bridge
@@ -23983,6 +24350,7 @@
    0406  Haswell Integrated Graphics Controller
    040a  Xeon E3-1200 v3 Processor Integrated Graphics Controller
    0412  Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
+		103c 1998  EliteDesk 800 G1
    	17aa 309f  ThinkCentre M83
    0416  4th Gen Core Processor Integrated Graphics Controller
    	17aa 220e  ThinkPad T440p
@@ -24051,7 +24419,10 @@
    06eb  Comet Lake PCH Serial IO I2C Controller #3
    06ed  Comet Lake USB 3.1 xHCI Host Controller
    06ef  Comet Lake PCH Shared SRAM
-	06f0  Wi-Fi 6 AX201
+	06f0  Comet Lake PCH CNVi WiFi
+		8086 0034  Wireless-AC 9560
+		8086 0074  Wi-Fi 6 AX201 160MHz
+		8086 02a4  Wireless-AC 9462
    06f9  Comet Lake PCH Thermal Controller
    06fb  Comet Lake PCH Serial IO SPI Controller #2
    0700  CE Media Processor A/V Bridge
@@ -24508,7 +24879,7 @@
    	1d49 4714  Thinksystem Intel P4600 NVMe AIC
    	1d49 4802  Thinksystem U.2 P4510 NVMe SSD
    	1d49 4812  Thinksystem U.2 P4610 NVMe SSD
-		8086 4308  Intel SSD D5-P4320 and D5-P4326
+		8086 4308  SSD D5-P4320 and D5-P4326
    	8086 4702  NVMe Datacenter SSD [3DNAND] SE 2.5" U.2 (P4500)
    	8086 4704  NVMe Datacenter SSD [3DNAND] SE AIC (P4500)
    	8086 4712  NVMe Datacenter SSD [3DNAND] ME 2.5" U.2 (P4600)
@@ -24524,6 +24895,19 @@
    	1028 1fe7  Express Flash NVMe 3.2TB 2.5" U.2 (P4600)
    	1028 1fe8  Express Flash NVMe 2.0TB HHHL AIC (P4600)
    	1028 1fe9  Express Flash NVMe 4.0TB HHHL AIC (P4600)
+	0b60  NVMe DC SSD [3DNAND, Beta Rock Controller]
+		1028 2060  NVMe SED MU U.2 1.6TB (P5600)
+		1028 2061  NVMe SED MU U.2 3.2TB (P5600)
+		1028 2062  NVMe SED MU U.2 6.4TB (P5600)
+		1028 2064  NVMe SED RI U.2 1.92TB (P5500)
+		1028 2065  NVMe SED RI U.2 3.84TB (P5500)
+		1028 2066  NVMe SED RI U.2 7.68TB (P5500)
+		1028 209e  NVMe MU U.2 1.6TB (P5600)
+		1028 209f  NVMe MU U.2 3.2TB (P5600)
+		1028 2100  NVMe MU U.2 6.4TB (P5600)
+		1028 2102  NVMe RI U.2 1.92TB (P5500)
+		1028 2103  NVMe RI U.2 3.84TB (P5500)
+		1028 2104  NVMe RI U.2 7.68TB (P5500)
    0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
    0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
    	105b 0d7c  D270S/D250S Motherboard
@@ -24551,6 +24935,7 @@
    0bf6  Atom Processor D2xxx/N2xxx DRAM Controller
    0bf7  Atom Processor D2xxx/N2xxx DRAM Controller
    0c00  4th Gen Core Processor DRAM Controller
+		103c 1998  EliteDesk 800 G1
    	17aa 309f  ThinkCentre M83
    0c01  Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller
    0c04  Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller
@@ -24560,6 +24945,7 @@
    0c08  Xeon E3-1200 v3 Processor DRAM Controller
    0c09  Xeon E3-1200 v3/4th Gen Core Processor PCI Express x4 Controller
    0c0c  Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    0c46  Atom Processor S1200 PCI Express Root Port 1
@@ -24619,6 +25005,7 @@
    0d58  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
    	8086 0000  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
    	8086 0001  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+	0d9f  Ethernet Controller (2) I225-IT
    0e00  Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
    	1028 04f7  Xeon E5 v2 on PowerEdge R320 server
    	15d9 066b  X9SRL-F
@@ -25720,6 +26107,7 @@
    1539  I211 Gigabit Network Connection
    153a  Ethernet Connection I217-LM
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    153b  Ethernet Connection I217-V
@@ -25801,6 +26189,7 @@
    	17aa 4001  ThinkServer X710-4 AnyFabric for 10GbE SFP+
    	17aa 4002  ThinkServer X710-2 AnyFabric for 10GbE SFP+
    	19e5 d11c  Ethernet 2-port X710 10Gb SFP+ Adapter SP330
+		1bd4 0056  Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
    	8086 0000  Ethernet Converged Network Adapter X710
    	8086 0001  Ethernet Converged Network Adapter X710-4
    	8086 0002  Ethernet Converged Network Adapter X710-4
@@ -25924,7 +26313,6 @@
    	8086 0008  Ethernet Network Adapter OCP XXV710-1
    	8086 0009  Ethernet 25G 2P XXV710 Adapter
    	8086 000a  Ethernet 25G 2P XXV710 OCP
-		8086 000c  Ethernet Network Adapter XXV710-DA2 for OCP 3.0
    	8086 4001  Ethernet Network Adapter XXV710-2
    1591  Ethernet Controller E810-C for backplane
    1592  Ethernet Controller E810-C for QSFP
@@ -25935,6 +26323,8 @@
    	8086 0006  Ethernet Network Adapter E810-C-Q2 for OCP3.0
    	8086 0009  Ethernet Network Adapter E810-C-Q1
    	8086 000a  Ethernet Network Adapter E810-C-Q1 for OCP
+		8086 000b  Ethernet 100G 2P E810-C Adapter
+		8086 000c  Ethernet 100G 2P E810-C OCP
    1593  Ethernet Controller E810-C for SFP
    	1137 02c3  E810XXVDA4 4x25/10 GbE SFP28 PCIe NIC
    	8086 0002  Ethernet Network Adapter E810-L-2
@@ -25943,10 +26333,13 @@
    	8086 0007  Ethernet Network Adapter E810-XXV-4
    	8086 0008  Ethernet Network Adapter E810-XXV-2
    	8086 0009  Ethernet Network Adapter E810-XXV-2 for OCP 2.0
+		8086 000a  Ethernet 25G 4P E810-XXV Adapter
    1599  Ethernet Controller E810-XXV for backplane
    159a  Ethernet Controller E810-XXV for QSFP
    159b  Ethernet Controller E810-XXV for SFP
    	1137 02be  E810XXVDA2 2x25/10 GbE SFP28 PCIe NIC
+		1bd4 0057  Ethernet Network Adapter E810-XXVAM2
+		1bd4 0058  Ethernet Network Adapter E810-XXVAM2 for OCP 3.0
    	8086 0001  Ethernet 25G 2P E810-XXV OCP
    	8086 0002  Ethernet 25G 2P E810-XXV Adapter
    	8086 0003  Ethernet Network Adapter E810-XXV-2
@@ -26004,7 +26397,7 @@
    15d3  JHL6540 Thunderbolt 3 Bridge (C step) [Alpine Ridge 4C 2016]
    15d4  JHL6540 Thunderbolt 3 USB Controller (C step) [Alpine Ridge 4C 2016]
    15d5  Ethernet SDI Adapter FM10420-25GbE-DA2
-		8086 0001  Intel(R) Ethernet SDI Adapter FM10420-25GbE-DA2
+		8086 0001  Ethernet SDI Adapter FM10420-25GbE-DA2
    15d6  Ethernet Connection (5) I219-V
    15d7  Ethernet Connection (4) I219-LM
    15d8  Ethernet Connection (4) I219-V
@@ -26029,6 +26422,11 @@
    15ec  JHL7540 Thunderbolt 3 USB Controller [Titan Ridge 4C 2018]
    15ef  JHL7540 Thunderbolt 3 Bridge [Titan Ridge DD 2018]
    15f0  JHL7540 Thunderbolt 3 USB Controller [Titan Ridge DD 2018]
+	15f2  Ethernet Controller I225-LM
+		8086 0001  Ethernet Network Adapter I225-T1
+		8086 0002  Ethernet Network Adapter I225-T1
+	15f3  Ethernet Controller I225-V
+		8086 0003  Intel(R) Ethernet Controller (3) I225-V
    15f4  Ethernet Connection (15) I219-LM
    15f5  Ethernet Connection (15) I219-V
    15f6  I210 Gigabit Ethernet Connection
@@ -26093,10 +26491,19 @@
    163d  Broadwell-U Integrated Graphics
    163e  Broadwell-U Integrated Graphics
    1889  Ethernet Adaptive Virtual Function
+	1890  Ethernet Connection E822-C for backplane
+	1891  Ethernet Connection E822-C for QSFP
+	1892  Ethernet Connection E822-C for SFP
+	1893  Ethernet Connection E822-C/X557-AT 10GBASE-T
+	1894  Ethernet Connection E822-C 1GbE
+	1897  Ethernet Connection E822-L for backplane
+	1898  Ethernet Connection E822-L for SFP
+	1899  Ethernet Connection E822-L/X557-AT 10GBASE-T
+	189a  Ethernet Connection E822-L 1GbE
    18a0  C4xxx Series QAT
    18a1  C4XXX Series QAT Virtual Function
    1900  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
-	1901  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x16)
+	1901  6th-9th Gen Core Processor PCIe Controller (x16)
    1902  HD Graphics 510
    1903  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem
    	1028 06d6  Latitude 7275 tablet
@@ -28371,7 +28778,6 @@
    	1775 11cc  CC11/CL11
    27e2  82801GR/GH/GHM (ICH7 Family) PCI Express Port 6
    	1775 11cc  CC11/CL11
-	280b  Intel(R) Display Audio
    2810  82801HB/HR (ICH8/R) LPC Interface Controller
    	1043 81ec  P5B
    2811  82801HEM (ICH8M-E) LPC Interface Controller
@@ -29446,6 +29852,7 @@
    2ffc  Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
    2ffd  Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
    2ffe  Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	3140  Easel/Monette Hill Image Processor [Pixel Visual Core]
    3165  Wireless 3165
 # Stone Peak 1x1
    	8086 4010  Dual Band Wireless AC 3165
@@ -29457,8 +29864,11 @@
    3185  UHD Graphics 605
    318c  Celeron/Pentium Silver Processor Dynamic Platform and Thermal Framework Processor Participant
    318e  Celeron/Pentium Silver Processor NorthPeak
+	3190  Celeron/Pentium Silver Processor Gaussian Mixture Model
    3192  Gemini Lake P2SB
    3197  Celeron/Pentium Silver Processor PCI-default ISA-bridge
+	3198  Celeron/Pentium Silver Processor High Definition Audio
+		17aa 380b  V130-15IGM Laptop (Lenovo) - Type 81HL
    319a  Celeron/Pentium Silver Processor Trusted Execution Engine Interface
    31a2  Celeron/Pentium Silver Processor Integrated Sensor Solution
    31ac  Celeron/Pentium Silver Processor Serial IO I2C Host Controller
@@ -29477,6 +29887,7 @@
    31d9  Gemini Lake PCI Express Root Port
    31da  Gemini Lake PCI Express Root Port
    31db  Gemini Lake PCI Express Root Port
+	31dc  AC 1550i Wireless
    31ee  Celeron/Pentium Silver Processor Serial IO UART Host Controller
    31f0  Gemini Lake Host Bridge
    3200  GD31244 PCI-X SATA HBA
@@ -29768,6 +30179,8 @@
    372c  Xeon C5500/C3500 Reserved
    373f  Xeon C5500/C3500 IOxAPIC
    37c8  C62x Chipset QuickAssist Technology
+		8086 0001  QuickAssist Adapter 8960
+		8086 0002  QuickAssist Adapter 8970
    37cc  Ethernet Connection X722
    37cd  Ethernet Virtual Function 700 Series
    37ce  Ethernet Connection X722 for 10GbE backplane
@@ -30179,9 +30592,10 @@
    3e18  8th Gen Core 4-core Workstation Processor Host Bridge/DRAM Registers [Coffee Lake S]
    3e1f  8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
    	1458 5000  Z370 AORUS Gaming K3-CF
-	3e30  8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
+	3e30  8th/9th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
    3e33  8th/9th Gen Core Processor Host Bridge/DRAM Registers [Coffee Lake]
    3e34  Coffee Lake HOST and DRAM Controller
+	3e35  Coffee Lake Host Bridge/DRAM Registers
    3e81  8th Gen Core Processor PCIe Controller (x16)
    3e85  8th Gen Core Processor PCIe Controller (x8)
    3e89  8th Gen Core Processor PCIe Controller (x4)
@@ -30378,6 +30792,7 @@
    5201  EtherExpress PRO/100 Intelligent Server Fast Ethernet Controller
    	8086 0001  EtherExpress PRO/100 Server Ethernet Adapter
    530d  80310 (IOP) IO Processor
+	5502  Ethernet Controller (2) I225-LMvP
    5845  QEMU NVM Express Controller
    	1af4 1100  QEMU Virtual Machine
    5900  Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
@@ -30809,14 +31224,15 @@
    8a1f  Ice Lake Thunderbolt 3 PCI Express Root Port #1
    8a21  Ice Lake Thunderbolt 3 PCI Express Root Port #2
    8a23  Ice Lake Thunderbolt 3 PCI Express Root Port #3
-	8a51  Intel Iris Plus Graphics G7 (Ice Lake)
+	8a51  Iris Plus Graphics G7 (Ice Lake)
    8a52  Iris Plus Graphics G7
    8a56  Iris Plus Graphics G1 (Ice Lake)
    8a5a  Iris Plus Graphics G4 (Ice Lake)
-	8a5c  Intel Iris Plus Graphics G4 (Ice Lake)
+	8a5c  Iris Plus Graphics G4 (Ice Lake)
    8c00  8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
    8c01  8 Series Chipset Family 4-port SATA Controller 1 [IDE mode] - Mobile
    8c02  8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode]
+		103c 1998  EliteDesk 800 G1
    	17aa 309f  ThinkCentre M83
    8c03  8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode]
    	103c 1909  ZBook 15
@@ -30830,10 +31246,12 @@
    8c0e  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
    8c0f  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
    8c10  8 Series/C220 Series Chipset Family PCI Express Root Port #1
+		103c 1998  EliteDesk 800 G1
    	1043 8534  ASUS H81I-PLUS
    	17aa 220e  ThinkPad T440p
    8c11  8 Series/C220 Series Chipset Family PCI Express Root Port #1
    8c12  8 Series/C220 Series Chipset Family PCI Express Root Port #2
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    8c13  8 Series/C220 Series Chipset Family PCI Express Root Port #2
    8c14  8 Series/C220 Series Chipset Family PCI Express Root Port #3
@@ -30850,38 +31268,45 @@
    8c1f  8 Series/C220 Series Chipset Family PCI Express Root Port #8
    8c20  8 Series/C220 Series Chipset High Definition Audio Controller
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    8c21  8 Series/C220 Series Chipset High Definition Audio Controller
    8c22  8 Series/C220 Series Chipset Family SMBus Controller
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    8c23  8 Series Chipset Family CHAP Counters
    8c24  8 Series Chipset Family Thermal Management Controller
    8c26  8 Series/C220 Series Chipset Family USB EHCI #1
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 2210  ThinkPad T540p
    	17aa 309f  ThinkCentre M83
    	2210 17aa  ThinkPad T540p
    8c2d  8 Series/C220 Series Chipset Family USB EHCI #2
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    8c31  8 Series/C220 Series Chipset Family USB xHCI
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    8c33  8 Series/C220 Series Chipset Family LAN Controller
    8c34  8 Series/C220 Series Chipset Family NAND Controller
    8c3a  8 Series/C220 Series Chipset Family MEI Controller #1
    	103c 1909  ZBook 15
+		103c 1998  EliteDesk 800 G1
    	17aa 220e  ThinkPad T440p
    	17aa 309f  ThinkCentre M83
    8c3b  8 Series/C220 Series Chipset Family MEI Controller #2
    8c3c  8 Series/C220 Series Chipset Family IDE-r Controller
    8c3d  8 Series/C220 Series Chipset Family KT Controller
+		103c 1998  EliteDesk 800 G1
    8c40  8 Series/C220 Series Chipset Family LPC Controller
    8c41  8 Series Chipset Family Mobile Super SKU LPC Controller
    8c42  8 Series/C220 Series Chipset Family Desktop Super SKU LPC Controller
@@ -30898,6 +31323,7 @@
    	17aa 309f  ThinkCentre M83
    8c4d  8 Series/C220 Series Chipset Family LPC Controller
    8c4e  Q87 Express LPC Controller
+		103c 1998  EliteDesk 800 G1
    8c4f  QM87 Express LPC Controller
    	103c 1909  ZBook 15
    	17aa 220e  ThinkPad T440p
@@ -31047,8 +31473,10 @@
    9b41  UHD Graphics
    9b44  10th Gen Core Processor Host Bridge/DRAM Registers
    9b54  10th Gen Core Processor Host Bridge/DRAM Registers
+	9b61  Comet Lake-U v1 4c Host Bridge/DRAM Controller
    9b64  10th Gen Core Processor Host Bridge/DRAM Registers
    9bc4  UHD Graphics
+	9bc8  UHD Graphics 630
    9c00  8 Series SATA Controller 1 [IDE mode]
    9c01  8 Series SATA Controller 1 [IDE mode]
    9c02  8 Series SATA Controller 1 [AHCI mode]
@@ -31629,8 +32057,12 @@
    	1028 0869  Vostro 3470
    a36f  Cannon Lake PCH Shared SRAM
    a370  Wireless-AC 9560 [Jefferson Peak]
+		1a56 1552  Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)
    a379  Cannon Lake PCH Thermal Controller
    	1028 0869  Vostro 3470
+	a382  400 Series Chipset Family SATA AHCI Controller
+	a3a3  Comet Lake PCH-V SMBus Host Controller
+	a3b1  Comet Lake PCH-V Thermal Subsystem
    a620  6400/6402 Advanced Memory Buffer (AMB)
    abc0  Omni-Path Fabric Switch Silicon 100 Series
    b152  21152 PCI-to-PCI Bridge
@@ -31671,7 +32103,7 @@
    d158  Core Processor Miscellaneous Registers
    f1a5  SSD 600P Series
    f1a6  SSD Pro 7600p/760p/E 6100p Series
-		8086 390b  Intel Corporation SSD Pro 7600p/760p/E 6100p Series [NVM Express]
+		8086 390b  SSD Pro 7600p/760p/E 6100p Series [NVM Express]
    f1a8  SSD 660P Series
 8088  Beijing Wangxun Technology Co., Ltd.
    0101  WX1860A2 Gigabit Ethernet Controller
@@ -32023,7 +32455,7 @@
    	9005 0552  Series 8 - ASR-8805 - 8 internal 0 external 12G SAS Port/PCIe 3.0
    	9005 0553  Series 8 - ASR-8085 - 0 internal 8 external 12G SAS Port/PCIe 3.0
    	9005 0554  Series 8 - ASR-8885 - 8 internal 8 external 12G SAS Port/PCIe 3.0
-	028f  Smart Storage PQI 12G SAS/PCIe 3
+	028f  Smart Storage PQI SAS
    	103c 0600  Smart Array P408i-p SR Gen10
    	103c 0601  Smart Array P408e-p SR Gen10
    	103c 0602  Smart Array P408i-a SR Gen10
@@ -32045,6 +32477,10 @@
    	152d 8a24  QS-8236-16i
    	152d 8a36  QS-8240-24i
    	152d 8a37  QS-8242-24i
+		193d 1104  RAID P2404-Mf-4i-2GB
+		193d 1105  RAID P4408-Mf-8i-2GB
+		193d 1106  RAID P2404-Mf-4i-1GB
+		193d 1107  RAID P4408-Mf-8i-4GB
    	193d 8460  HBA H460-M1
    	193d 8461  HBA H460-B1
    	193d c460  RAID P460-M2
@@ -32074,6 +32510,8 @@
    	9005 0805  SmartRAID 3102-8i
    	9005 0806  SmartRAID 3100
    	9005 0807  SmartRAID 3162-8i
+		9005 0808  SmartRAID 3101E-4i
+		9005 0809  SmartRAID 3102E-8i
    	9005 0900  SmartHBA 2100-8i
    	9005 0901  SmartHBA 2100-4i
    	9005 0902  HBA 1100-8i
@@ -32089,6 +32527,7 @@
    	9005 1202  SmartRAID 3154-8i8e
    	9005 1280  HBA 1100-16i
    	9005 1281  HBA 1100-16e
+		9005 1282  SmartHBA 2100-16i
    	9005 1300  HBA 1100-8i8e
    	9005 1301  HBA 1100-24i
    	9005 1302  SmartHBA 2100-8i8e
@@ -32208,6 +32647,14 @@
    0001  SG2010 PCI over Starfabric Bridge
    0002  SG2010 PCI to Starfabric Gateway
    0003  SG1010 Starfabric Switch and PCI Bridge
+9d32  Beijing Starblaze Technology Co. Ltd.
+	0000  STAR1000 PCIe NVMe SSD Controller
+	1001  STAR1000P PCIe NVMe SSD Controller
+	1201  STAR1200C NVMe SSD
+	1202  STAR1200I NVMe SSD
+	1203  STAR1200L NVMe SSD
+	1204  STAR1200E NVMe SSD
+a000  Asix Electronics Corporation (Wrong ID)
 a0a0  AOPEN Inc.
 a0f1  UNISYS Corporation
 a200  NEC Corporation
@@ -32596,6 +33043,7 @@ ffff  Illegal Vendor ID
 C 00  Unclassified device
    00  Non-VGA unclassified device
    01  VGA compatible unclassified device
+	05  Image coprocessor
 C 01  Mass storage controller
    00  SCSI storage controller
    01  IDE interface
diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index ad5557490..02e2ef420 100644
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2020.01.09
-# Date:    2020-01-09 20:34:06
+# Version: 2020.08.26
+# Date:    2020-08-26 20:34:09
 #
# Vendors, devices and interfaces. Please keep sorted.
@@ -23,6 +23,7 @@
 0001  Fry's Electronics
    7778  Counterfeit flash drive [Kingston]
 0002  Ingram
+	0002  passport00
 0003  Club Mac
 0004  Nebraska Furniture Mart
 0011  Unknown
@@ -38,10 +39,11 @@
    181b  Venom Arcade Joystick
    1843  Mayflash GameCube Controller Adapter
    1844  Mayflash GameCube Controller
-0080  Assmann Electronic GmbH
-	a001  Digitus DA-71114 SATA
+0080  Unknown
+	a001  JMS578 based SATA bridge
 0085  Boeye Technology Co., Ltd.
    0600  eBook Reader
+0102  miniSTREAK
 0105  Trust International B.V.
    145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
 0127  IBP
@@ -172,6 +174,7 @@
    7617  AT76C505AS Wireless Adapter
    7800  Mini Album
    800c  Airspy HF+
+	ff01  WootingOne
    ff02  WootingTwo
    ff07  Tux Droid fish dongle
 03ec  Iwatsu America, Inc.
@@ -413,6 +416,7 @@
    2417  LaserJet 4250
    241d  Gobi 2000 Wireless Modem (QDL mode)
    2424  LP1965 19" Monitor Hub
+	2441  Prime G2 [2AP18AA]
    2502  PhotoSmart 7700 series
    2504  DeskJet F4200 series
    2505  ScanJet 3770
@@ -465,6 +469,7 @@
    3111  OfficeJet 4100 series
    3117  EWS 2605dtn
    311d  Atheros AR9285 Malbec Bluetooth Adapter
+	312a  LaserJet Pro M701n
    3202  PhotoSmart 1215
    3207  4 GB flash drive
    3211  OfficeJet 4105 series
@@ -481,6 +486,7 @@
    3504  DeskJet 6127c
    3511  PSC 2300
    3517  LaserJet 3390
+	354a  Slim Keyboard
    3602  PhotoSmart 1315
    3611  PSC 2410 PhotoSmart
    3612  Officejet Pro 8000 A809
@@ -514,6 +520,7 @@
    3e17  LaserJet P1006
    3f02  PhotoSmart 7550~
    3f11  PSC-1315/PSC-1317
+	3f17  Laserjet P1505
    4002  PhotoSmart 635/715/720/735/935/E337 (storage)
    4004  CP1160
    4102  PhotoSmart 618
@@ -635,6 +642,7 @@
    7917  LaserJet M5025 MFP
    7a02  PhotoSmart M415 (PTP mode)
    7a04  DeskJet D2460
+	7a11  Photosmart B109
    7a17  LaserJet M3027 MFP
    7b02  PhotoSmart M23 (PTP mode)
    7b17  Color LaserJet CP4005
@@ -702,6 +710,7 @@
    c102  PhotoSmart 8000 series
    c111  Deskjet 1510
    c202  PhotoSmart 8200 series
+	c211  Deskjet 2540 series
    c302  DeskJet D2300
    c402  PhotoSmart D5100 series
    c502  PhotoSmart D6100 series
@@ -788,6 +797,7 @@
    6011  FT4232H Quad HS USB-UART/FIFO IC
    6014  FT232H Single HS USB-UART/FIFO IC
    6015  Bridge(I2C/SPI/UART/FIFO)
+	601f  Myriad-RF LimeSDR-Mini
    6f70  HB-RF-USB
    8028  Dev board JTAG (FT232H based)
    8040  4 Port Hub
@@ -798,6 +808,7 @@
    8370  7 Port Hub
    8371  PS/2 Keyboard And Mouse
    8372  FT8U100AX Serial Port
+	8508  Selectronic SP PRO
    87d0  Cressi Dive Computer Interface
    8a28  Rainforest Automation ZigBee Controller
    8a98  TIAO Multi-Protocol Adapter
@@ -812,6 +823,7 @@
    9135  Rotary Pub alarm
    9136  Pulsecounter
    9e90  Marvell OpenRD Base/Client
+	9f08  CIB-1894 Conclusion SmartLink Box:
    9f80  Ewert Energy Systems CANdapter
    a6d0  Texas Instruments XDS100v2 JTAG / BeagleBone A3
    a951  HCP HIT GSM/GPRS modem [Cinterion MC55i]
@@ -964,6 +976,7 @@
    1030  FV TouchCam N1 (Video)
    3000  Optical dual-touch panel
    3001  Optical Touch Screen
+	3008  Optical Touch Screen
    a060  HD Webcam
 0409  NEC Corp.
    0011  PC98 Series Layout Keyboard Mouse
@@ -1165,6 +1178,7 @@
    602a  i900
 040b  Weltrend Semiconductor
    0a68  Func MS-3 gaming mouse [WT6573F MCU]
+	2000  wired Keyboard [Dynex DX-WRK1401]
    2367  Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
    6510  Weltrend Bar Code Reader
    6520  Xploder Xbox Memory Unit (8MB)
@@ -1290,6 +1304,14 @@
    3812  Smart Card Controller_2Interface
    3813  Panel Display
    5011  Virtual Com Port
+	511b  Nuvoton Nu-Link1 ICE
+	511c  Nuvoton Nu-Link1 ICE
+	511d  Nuvoton Nu-Link1 ICE/VCOM
+	511e  Nuvoton Nu-Link1 MSC/VCOM
+	5200  Nuvoton Nu-Link2-ME ICE/MSC/VCOM
+	5201  Nuvoton Nu-Link2-Pro ICE/MSC/VCOM
+	5210  Nuvoton Nu-Link2 MSC FW UPGRADE
+	5211  Nuvoton Nu-Link2 HID FW UPGRADE
    5518  4-Port Hub
    551a  PC Sync Keypad
    551b  PC Async Keypad
@@ -1352,6 +1374,7 @@
    3220  Sound Blaster Tactic(3D) Sigma sound card
    3232  Sound Blaster Premium HD [SBX]
    3237  SB X-Fi Surround 5.1 Pro
+	3263  SB X-Fi Surround 5.1 Pro
    3f00  E-Mu Xboard 25 MIDI Controller
    3f02  E-Mu 0202
    3f04  E-Mu 0404
@@ -1643,6 +1666,7 @@
    2744  Hub
    274d  HTC Hub Controller
    2807  Hub
+	3fc7  RME Babyface audio system
    3fcc  RME MADIface
    4041  Hub and media card controller
    4060  Ultra Fast Media Reader
@@ -1886,6 +1910,7 @@
 043e  LG Electronics USA, Inc.
    3001  AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]
    3004  TWFM-B003D 802.11abgn Wireless Module [Broadcom BCM43236B]
+	3009  VC400
    3101  AN-WF500 802.11abgn + BT Wireless Adapter [Broadcom BCM43242]
    42bd  Flatron 795FT Plus Monitor
    4a4d  Flatron 915FT Plus Monitor
@@ -1963,6 +1988,7 @@
    b307  vibrating Upad
    b30b  Wireless VibrationPad
    b315  Firestorm Dual Analog 3
+	b320  Dual Trigger gamepad PC/PS2 2.0
    b323  Dual Trigger 3-in-1 (PC Mode)
    b324  Dual Trigger 3-in-1 (PS3 Mode)
    b326  Gamepad GP XID
@@ -1980,14 +2006,19 @@
    b700  Tacticalboard
 0450  DFI, Inc.
 0451  Texas Instruments, Inc.
+	0422  TUSB422 Port Controller with Power Delivery
    1234  Bluetooth Device
    1428  Hub
    1446  TUSB2040/2070 Hub
+	16a2  CC Debugger
    16a6  BM-USBD1 BlueRobin RF heart rate sensor receiver
+	16a8  CC2531 ZigBee
+	16ae  CC2531 Dongle
    2036  TUSB2036 Hub
    2046  TUSB2046 Hub
    2077  TUSB2077 Hub
    2f90  SM-USB-DIG
+	3200  TUSB3200 Boot Loader
    3410  TUSB3410 Microcontroller
    3f00  OMAP1610
    3f02  SMC WSKP100 Wi-Fi Phone
@@ -2018,6 +2049,7 @@
    e012  TI-Nspire Calculator
    e013  Network Bridge
    e01c  Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]
+	e01e  Nspire CX Navigator Access Point
    e01f  Python Adapter (firmware install mode)
    e020  Python Adapter
    e022  Nspire CX II
@@ -2050,6 +2082,7 @@
    0002  Genius NetMouse Pro
    0003  Genius NetScroll+
    0006  Easy Mouse+
+	0007  Trackbar Emotion
    000b  NetMouse Wheel(P+U)
    000c  TACOMA Fingerprint V1.06.01
    000e  Genius NetScroll Optical
@@ -2072,6 +2105,7 @@
    0072  Navigator 335
    0083  Bluetooth Dongle
    0087  Ergo 525V Laser Mouse
+	0088  Genius Traveler 515 Laser
    0089  Genius Traveler 350
    00ca  Pen Mouse
    0100  EasyPen Tablet
@@ -2175,6 +2209,7 @@
    501e  Rio Chiba
    501f  Rio Cali
    503f  Cali256 MP3 Player
+	5042  Rio Forge
    5202  Rio Riot MP3 Player
    5210  Rio Karma Music Player
    5220  Rio Nitrus MP3 Player
@@ -2256,6 +2291,7 @@
    00cb  Basic Optical Mouse v2.0
    00ce  Generic PPC Flash device
    00d1  Optical Mouse with Tilt Wheel
+	00d2  Notebook Optical Mouse with Tilt Wheel
    00da  eHome Infrared Receiver
    00db  Natural Ergonomic Keyboard 4000 V1.0
    00dd  Comfort Curve Keyboard 2000 V1.0
@@ -2469,11 +2505,14 @@
    07b2  2.4GHz Transceiver v8.0 used by mouse Wireless Desktop 900
    07b6  Comfort Curve Keyboard 3000
    07b9  Wired Keyboard 200
-	07c6  RTL8153 GigE [Surface Dock Ethernet]
+	07c6  RTL8153 GigE [Surface Ethernet Adapter]
    07ca  Surface Pro 3 Docking Station Audio Device
    07cd  Surface Keyboard
    07f8  Wired Keyboard 600 (model 1576)
    07fd  Nano Transceiver 1.1
+	0800  Wireless keyboard (All-in-One-Media)
+	0810  LifeCam HD-3000
+	0823  Classic IntelliMouse
    0900  Surface Dock Hub
    0901  Surface Dock Hub
    0902  Surface Dock Hub
@@ -2483,6 +2522,10 @@
    090b  Hub
    090c  SD Card
    091a  Hub
+	0927  RTL8153B GigE [Surface Ethernet Adapter]
+	0955  Hub
+	0957  Hub
+	09a0  RTL8153B GigE [Surface Ethernet Adapter]
    09c0  Surface Type Cover
    0a00  Lumia 950 Dual SIM (RM-1118)
    930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
@@ -2551,12 +2594,15 @@
    4d62  HP Laser Mobile Mini Mouse
    4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
    4d81  Dell N889 Optical Mouse
+	4d8a  HP Multimedia Keyboard
    4d91  Laser mouse M-D16DL
    4d92  Optical mouse M-D17DR
    4db1  Dell Laptop Integrated Webcam 2Mpix
    4de3  HP 5-Button Optical Comfort Mouse
    4de7  webcam
    4e04  Lenovo Keyboard KB1021
+	4e22  Dell Mouse, 2 Buttons, Modell: MS111-P
+	4e6f  Acer Wired Keyboard Model KBAY211
 0463  MGE UPS Systems
    0001  UPS
    ffff  UPS
@@ -2585,6 +2631,7 @@
    00a1  SmartCard Reader Keyboard KC 1000 SC
    0106  R-300 Wireless Mouse Receiver
    010d  MX-Board 3.0 Keyboard
+	0180  Strait 3.0
    b090  Keyboard
    b091  Mouse
 046b  American Megatrends, Inc.
@@ -2730,6 +2777,7 @@
    0a07  Z-10 Speakers
    0a0b  ClearChat Pro USB
    0a0c  Clear Chat Comfort USB Headset
+	0a10  V10 Notebook Speakers
    0a13  Z-5 Speakers
    0a14  USB Headset
    0a15  G35 Headset
@@ -2742,6 +2790,7 @@
    0a45  960 Headset
    0a4d  G430 Surround Sound Gaming Headset
    0a5b  G933 Wireless Headset Dongle
+	0a5d  G933 Headset Battery Charger
    0a66  [G533 Wireless Headset Dongle]
    0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
    8801  Video Camera
@@ -2821,6 +2870,7 @@
    c080  G303 Gaming Mouse
    c083  G403 Prodigy Gaming Mouse
    c084  G203 Gaming Mouse
+	c08b  G502 SE HERO Gaming Mouse
    c101  UltraX Media Remote
    c110  Harmony 785/880/885 Remote
    c111  Harmony 525 Remote
@@ -2869,13 +2919,17 @@
    c22d  G510 Gaming Keyboard
    c22e  G510 Gaming Keyboard onboard audio
    c231  G13 Virtual Mouse
+	c232  Gaming Virtual Keyboard
    c245  G400 Optical Mouse
    c246  Gaming Mouse G300
+	c247  G100S Optical Gaming Mouse
    c248  G105 Gaming Keyboard
    c24a  G600 Gaming Mouse
    c24c  G400s Optical Mouse
    c24d  G710 Gaming Keyboard
    c24e  G500s Laser Gaming Mouse
+	c24f  G29 Driving Force Racing Wheel [PS3]
+	c260  G29 Driving Force Racing Wheel [PS4]
    c281  WingMan Force
    c283  WingMan Force 3D
    c285  WingMan Strike Force 3D
@@ -2919,6 +2973,7 @@
    c31f  Comfort Keyboard K290
    c326  Washable Keyboard K310
    c328  Corded Keyboard K280e
+	c32b  G910 Orion Spark Mechanical Keyboard
    c332  G502 Proteus Spectrum Optical Mouse
    c335  G910 Orion Spectrum Mechanical Keyboard
    c33a  G413 Gaming Keyboard
@@ -2960,6 +3015,8 @@
    c531  C-U0007 [Unifying Receiver]
    c532  Unifying Receiver
    c534  Unifying Receiver
+	c537  Cordless Mouse Receiver
+	c53a  PowerPlay Wireless Charging System
    c603  3Dconnexion Spacemouse Plus XT
    c605  3Dconnexion CADman
    c606  3Dconnexion Spacemouse Classic
@@ -3120,6 +3177,7 @@
    2160  Mio LINK Heart Rate Monitor
    21e0  GoGEAR Raga
    262c  SPC230NC Webcam
+	2721  PTA 317 TV Camera
    485d  Senselock SenseIV v2.x
    df55  LPCXpresso LPC-Link
 0472  Chicony Electronics Co., Ltd
@@ -3247,15 +3305,19 @@
    f101  Atlas Modem
 047f  Plantronics, Inc.
    0101  Bulk Driver
+	02ee  BT600
    0301  Bulk Driver
    0411  Savi Office Base Station
    0ca1  USB DSP v4 Audio Interface
    4254  BUA-100 Bluetooth Adapter
+	aa05  DA45
    ac01  Savi 7xx
    ad01  GameCom 777 5.1 Headset
    af01  DA80
    c008  Audio 655 DSP
    c00e  Blackwire C310 headset
+	c03b  HD1
+	da60  DA60
 0480  Toshiba America Inc
    0001  InTouch Module
    0004  InTouch Module
@@ -3265,6 +3327,7 @@
    0200  External Disk
    0820  Canvio Advance Disk
    0821  Canvio Advance 2TB model DTC920
+	0900  MQ04UBF100
    a006  External Disk 1.5TB
    a007  External Disk USB 3.0
    a009  Stor.E Basics
@@ -3334,6 +3397,7 @@
    8259  Probe
    91d1  Sensor Hub
    a171  ThermaData WiFi
+	a2e0  BMeasure instrument
    df11  STM Device in DFU Mode
    ff10  Swann ST56 Modem
 0484  Specialix
@@ -3363,8 +3427,10 @@
 048d  Integrated Technology Express, Inc.
    1165  IT1165 Flash Controller
    1172  Flash Drive
+	1234  Chipsbank CBM2199 Flash Drive
    1336  SD/MMC Cardreader
    1345  Multi Cardreader
+	8297  IT8297 RGB LED Controller
    9006  IT9135 BDA Afatech DVB-T HDTV Dongle
    9009  Zolid HD DVD Maker
    9135  Zolid Mini DVB-T Stick
@@ -3708,6 +3774,7 @@
    10c9  PIXMA iP4600 Printer
    10ca  PIXMA iP3600 Printer
    10e3  PIXMA iX6850 Printer
+	12fe  Printer in service mode
    1404  W6400PG
    1405  W8400PG
    150f  BIJ2350 PCL
@@ -3823,6 +3890,7 @@
    178a  PIXMA MG3600 Series
    178d  PIXMA MG6853
    180b  PIXMA MG3000 series
+	1856  PIXMA TS6250
    1900  CanoScan LiDE 90
    1901  CanoScan 8800F
    1904  CanoScan LiDE 100
@@ -3891,6 +3959,7 @@
    2633  LASERCLASS 500
    2634  PC-D300/FAX-L400/ICD300
    2635  MPC190
+	2636  LBP3200
    2637  iR C6800
    2638  iR C3100
    263c  PIXMA MP360
@@ -3905,8 +3974,10 @@
    264f  MF5650 (FAX)
    2650  iR 6800C EUR
    2651  iR 3100C EUR
+	2654  LBP3600
    2655  FP-L170/MF350/L380/L398
    2656  iR1510-1670 CAPT Printer
+	2657  LBP3210
    2659  MF8100
    265b  CAPT Printer
    265c  iR C3220
@@ -3920,7 +3991,7 @@
    2666  iR C5800
    2667  iR85PLUS
    2669  iR105PLUS
-	266a  CAPT Device
+	266a  LBP3000
    266b  iR8070
    266c  iR9070
    266d  iR 5800C EUR
@@ -3935,31 +4006,47 @@
    2676  LBP2900
    2677  iR C2570
    2678  iR 2570C EUR
-	2679  CAPT Device
+	2679  LBP5000
    267a  iR2016
    267b  iR2020
    267d  MF7100 series
+	267e  LBP3300
    2684  MF3200 series
    2686  MF6500 series
    2687  iR4530
    2688  LBP3460
    2689  FAX-L180/L380S/L398S
    268a  LC310/L390/L408S
+	268b  LBP3500
    268c  iR C6870
    268d  iR 6870C EUR
    268e  iR C5870
    268f  iR 5870C EUR
    2691  iR7105
+	26a1  LBP5300
    26a3  MF4100 series
+	26a4  LBP5100
    26b0  MF4600 series
    26b4  MF4010 series
    26b5  MF4200 series
    26b6  FAX-L140/L130
-	26da  LBP3010B printer
+	26b9  LBP3310
+	26ba  LBP5050
+	26da  LBP3010/LBP3018/LBP3050
+	26db  LBP3100/LBP3108/LBP3150
    26e6  iR1024
+	26ea  LBP9100C
+	26ee  MF4320-4350
+	26f1  LBP7200C
+	26ff  LBP6300
    271a  LBP6000
+	271b  LBP6200
+	271c  LBP7010C/7018C
    2736  I-SENSYS MF4550d
    2737  MF4410
+	2742  imageRUNNER1133 series
+	2771  LBP6020
+	2796  LBP6230/6240
    3041  PowerShot S10
    3042  CanoScan FS4000US Film Scanner
    3043  PowerShot S20
@@ -4362,6 +4449,7 @@
    0429  D5100
    042a  D800 (ptp)
    0430  D7100
+	0436  D810
    043f  D5600
    0f03  PD-10 Wireless Printer Adapter
    4000  Coolscan LS 40 ED
@@ -4406,6 +4494,7 @@
    0002  CY7C63x0x Thermometer
    0033  Mouse
    0060  Wireless optical mouse
+	00f3  FX3 micro-controller (DFU mode)
    0100  Cino FuzzyScan F760-B
    0101  Keyboard/Hub
    0102  Keyboard with APM
@@ -4423,6 +4512,7 @@
    4611  Storage Adapter FX2 (CY)
    4616  Flash Disk (TPP)
    4624  DS-Xtreme Flash Card
+	4717  West Bridge
    5201  Combi Keyboard-Hub (Hub)
    5202  Combi Keyboard-Hub (Keyboard)
    5500  HID->COM RS232 Adapter
@@ -4452,7 +4542,9 @@
    f115  PSoC FirstTouch Programmer
    f231  DELLY Changer 4in1 universal IR remote
    f232  Mono embedded computer
-	fd13  Programmable power socket
+	fd10  Gembird MSIS-PM
+	fd13  Energenie EG-PMS
+	fd15  Energenie EG-PMS2
 04b5  ROHM LSI Systems USA, LLC
    3064  Hantek DSO-3064
 04b6  Hint Corp.
@@ -4517,7 +4609,7 @@
    0143  GT-S55
    0144  GT-S85
    0151  Perfection V800 Photo
-	0202  Receipt Printer M129C/TM-T70
+	0202  Interface Card UB-U05 for Thermal Receipt Printers [M129C/TM-T70/TM-T88IV]
    0401  CP 800 Digital Camera
    0402  PhotoPC 850z
    0403  PhotoPC 3000z
@@ -4595,7 +4687,7 @@
    0849  Stylus SX205
    084a  PX-501A [Stylus NX400]
    084d  PX-402A [Stylus SX115/Stylus NX110 Series]
-	084f  ME OFFICE 510
+	084f  Multifunctional Printer Scanner [ME Office 510 / Epson Stylus SX215]
    0850  EP-702A [Stylus Photo PX650/TX650 Series]
    0851  Stylus SX410
    0852  EP-802A [Artisan 710 Series/Stylus Photo PX710W/TX720W Series]
@@ -4636,6 +4728,7 @@
    0891  Stylus Office BX535WD
    0892  Stylus Office BX935FWD
    0893  EP-774A
+	0e03  Thermal Receipt Printer [TM-T20]
    1114  XP-440 [Expression Home Small-in-One Printer]
    1129  ET-4750 [WorkForce ET-4750 EcoTank All-in-One]
 04b9  Rainbow Technologies, Inc.
@@ -4665,6 +4758,7 @@
 04ba  Toucan Systems, Ltd
 04bb  I-O Data Device, Inc.
    0101  USB2-IDE/ATAPI Bridge Adapter
+	014a  HDCL-UT
    0201  USB2-IDE/ATAPI Bridge Adapter
    0204  DVD Multi-plus unit iU-CD2
    0206  DVD Multi-plus unit DVR-UEH8
@@ -4770,8 +4864,10 @@
    072c  Revio KD20M
    072d  Revio KD410Z
 04ca  Lite-On Technology Corp.
+	0020  USB Keyboard
    004b  Keyboard
    004f  SK-9020 keyboard
+	008a  Acer Wired Mouse Model SM-9023
    1766  HID Monitor Controls
    2004  Bluetooth 4.0 [Broadcom BCM20702A0]
    2006  Broadcom BCM43142A0 Bluetooth Device
@@ -4781,6 +4877,7 @@
    300d  Atheros AR3012 Bluetooth
    300f  Atheros AR3012 Bluetooth
    3014  Qualcomm Atheros Bluetooth
+	3015  Qualcomm Atheros QCA9377 Bluetooth
    7022  HP HD Webcam
    7025  HP HD Webcam
    7046  TOSHIBA Web Camera - HD
@@ -4935,11 +5032,13 @@
    8107  Microstick II
    8108  ChipKit Pro MX7 (PIC32MX)
    9004  Microchip REAL ICE
+	9009  ICD3
    900a  PICkit3
    9012  PICkit4
    9015  ICD 4 In-Circuit Debugger
    c001  PicoLCD 20x4
    e11c  TL866CS EEPROM Programmer [MiniPRO]
+	ed16  BeamiRC 2.0 CNC remote controller analoge
    edb4  micro PLC (ATSAMD51G19A) [Black Brix ECU II]
    edb5  ATMEGA32U4 [Black Brix ECU]
    f2c4  Macareux-labs Hygrometry Temperature Sensor
@@ -4961,7 +5060,9 @@
    ffee  Devantech USB-ISS
    ffef  PICoPLC [APStech]
 04d9  Holtek Semiconductor, Inc.
+	0006  Wired Keyboard (78/79 key) [RPI Wired Keyboard 5]
    0022  Portable Keyboard
+	0348  Keyboard
    048e  Optical Mouse
    0499  Optical Mouse
    1135  Mouse [MGK-15BU/MLK-15BU]
@@ -4984,10 +5085,13 @@
    a050  Chatman V1
    a052  USB-zyTemp
    a055  Keyboard
+	a075  Optical Gaming Mouse
    a096  Keyboard
    a09f  E-Signal LUOM G10 Mechanical Gaming Mouse
    a100  Mouse [HV-MS735]
    a11b  Mouse [MX-3200]
+	a29f  Microarray fingerprint reader
+	b534  LGT8F328P Microprocessor
    e002  MCU
 04da  Panasonic (Matsushita)
    0901  LS-120 Camera
@@ -5177,6 +5281,7 @@
    0110  Connect3D Flash Drive
    0111  Connect3D Flash Drive
    0300  E2530 / GT-C3350 Phones (Mass storage mode)
+	04e8  Galaxy (MIDI mode)
    1003  MP3 Player and Recorder
    1006  SDC-200Z
    130c  NX100
@@ -5372,7 +5477,7 @@
    685c  GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)
    685d  GT-I9100 Phone [Galaxy S II] (Download mode)
    685e  GT-I9100 / GT-C3350 Phones (USB Debugging mode)
-	6860  Galaxy series, misc. (MTP mode)
+	6860  Galaxy A5 (MTP)
    6863  Galaxy series, misc. (tethering mode)
    6864  GT-I9070 (network tethering, USB debugging enabled)
    6865  Galaxy (PTP mode)
@@ -5394,6 +5499,8 @@
    7081  Human Interface Device
    7301  Fingerprint Device
    8001  Handheld
+	8002  Portable SSD 500GB Model Number: MU - P8500B
+	8003  Portable SSD T1
    d003  GT-I9003
    e020  SERI E02 SCOM 6200 UMTS Phone
    e021  SERI E02 SCOM 6200 Virtual UARTs
@@ -5437,6 +5544,7 @@
    0833  KU-0833 Keyboard
    0841  HP Multimedia Keyboard
    0860  2.4G Multimedia Wireless Kit
+	0939  Amazon Basics mouse
    1061  HP KG-1061 Wireless Keyboard+Mouse
    1121  Periboard 717 Mini Wireless Keyboard
    a001  E-Video DC-100 Camera
@@ -5498,6 +5606,7 @@
    b217  Lenovo Integrated Camera (0.3MP)
    b221  integrated camera
    b230  Integrated HP HD Webcam
+	b249  HP Integrated Webcam
    b257  Lenovo Integrated Camera
    b26b  Sony Visual Communication Camera
    b272  Lenovo EasyCamera
@@ -5515,11 +5624,13 @@
    b3fd  HD WebCam (Asus N-series)
    b40e  HP Truevision HD camera
    b444  Lenovo Integrated Webcam
+	b49f  Bluetooth (RTL8723BE)
    b563  Integrated Camera
    b5ce  Integrated Camera
    b5cf  Integrated IR Camera
    b5db  HP Webcam
    b604  Integrated Camera (1280x720@30)
+	b681  ThinkPad T490 Webcam
 04f3  Elan Microelectronics Corp.
    000a  Touchscreen
    0103  ActiveJet K-2024 Multimedia Keyboard
@@ -5583,6 +5694,8 @@
    0039  HL-5340 series
    0041  HL-2250DN Laser Printer
    0042  HL-2270DW Laser Printer
+	004d  HL-6180DW series
+	0080  HL-L6250DN series
    0100  MFC8600/9650 series
    0101  MFC9600/9870 series
    0102  MFC9750/1200 series
@@ -5793,6 +5906,7 @@
    023e  DCP-197C
    023f  MFC-8680DN
    0240  MFC-J950DN
+	0245  MFC-9560CDW
    0248  DCP-7055 scanner/printer
    024e  MFC-7460DN
    0253  DCP-J125
@@ -6034,24 +6148,41 @@
    03bb  MFC-L2680W
    03bc  MFC-L2700DN
    03bd  DCP-J762N
+	03fd  ADS-2700W
    1000  Printer
    1002  Printer
    2002  PTUSB Printing
    2004  PT-2300/2310 p-Touch Laber Printer
    2007  PT-2420PC P-touch Label Printer
-	2015  QL-500 P-touch label printer
-	2016  QL-550 P-touch label printer
+	2015  QL-500 label printer
+	2016  QL-550 printer
    201a  PT-18R P-touch label printer
-	201b  QL-650TD P-touch Label Printer
-	2027  QL-560 P-touch Label Printer
-	2028  QL-570 P-touch Label Printer
+	201b  QL-650TD Label Printer
+	2020  QL-1050 Label Printer
+	2027  QL-560 Label Printer
+	2028  QL-570 Label Printer
+	202a  QL-1060N Label Printer
    202b  PT-7600 P-touch Label Printer
+	202c  PT-1230PC P-touch Label Printer E mode
+	202d  PT-2430PC P-touch Label Printer
+	2030  PT-1230PC P-touch Label Printer EL mode
    2041  PT-2730 P-touch Label Printer
+	2042  QL-700 Label Printer
+	2043  QL-710W Label Printer
+	2044  QL-720NW Label Printer
+	204d  QL-720NW Label Printer (mass storage mode)
    2061  PT-P700 P-touch Label Printer
    2064  PT-P700 P-touch Label Printer RemovableDisk
-	209b  QL-800 P-touch Label Printer
-	209c  QL-810W P-touch Label Printer
-	209d  QL-820NWB P-touch Label Printer
+	209b  QL-800 Label Printer
+	209c  QL-810W Label Printer
+	209d  QL-820NWB Label Printer
+	20a7  QL-1100 Label Printer
+	20a8  QL-1110NWB Label Printer
+	20a9  QL-1100 Label Printer (mass storage)
+	20aa  QL-1110NWB Label Printer (mass storage)
+	20ab  QL-1115NWB Label Printer
+	20ac  QL-1115NWB Label Printer (mass storage)
+	20c0  QL-600 Label Printer
    2100  Card Reader Writer
    2102  Sewing machine
    60a0  ADS-2000
@@ -6292,7 +6423,7 @@
    1080  NET1080 USB-USB Bridge
    1200  SSDC Adapter II
    1265  File-backed Storage Gadget
-	3424  Lumidigm Venus fingerprint sensor
+	3424  V30x/V4xx fingerprint sensor [Lumidigm]
    a0f0  Cambridge Electronic Devices Power1401 mk 2
    a140  USB Clik! 40
    a141  (OME) PocketZip 40 MP3 Player Driver
@@ -6302,7 +6433,7 @@
    a4a2  Linux-USB Ethernet/RNDIS Gadget
    a4a3  Linux-USB user-mode isochronous source/sink
    a4a4  Linux-USB user-mode bulk source/sink
-	a4a5  Pocketbook Pro 903 / Mobius 2 Action Cam
+	a4a5  Pocketbook Pro 903 / Mobius 2 Action Cam / xDuoo X3 / PocketBook Pro 602
    a4a6  Linux-USB Serial Gadget
    a4a7  Linux-USB Serial Gadget (CDC ACM mode)
    a4a8  Linux-USB Printer Gadget
@@ -6599,6 +6730,7 @@
    02c4  Device
    02d1  DVD RW
    02d2  PSP Slim
+	02d4  UP-CX1
    02d8  SBAC-US10 SxS PRO memory card reader/writer
    02e1  FeliCa S330 [PaSoRi]
    02ea  PlayStation 3 Memory Card Adaptor
@@ -6613,10 +6745,14 @@
    035b  Walkman NWZ-A828
    035c  NWZ-A726/A728/A729
    035f  UP-DR200 Photo Printer
+	0360  M2 Card Reader
    0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
    0385  Walkman NWZ-E436F
    0387  IC Recorder (P)
    03bc  Webbie HD - MHS-CM1
+	03c3  UP-DR80MD
+	03c4  Stryker SDP1000
+	03c5  UP-DR80
    03cc  SD Card Reader
    03d1  DPF-X95
    03d3  DR-BT100CX
@@ -6646,6 +6782,7 @@
    0c02  ILCE-7M3 [A7III] in Mass Storage mode
    0c03  ILCE-7M3 [A7III] in MTP mode
    0c34  ILCE-7M3 [A7III] in PC Remote mode
+	0cd3  WH-1000XM3 [Wireless Noise-Canceling Headphones]
    0cda  PlayStation Classic controller
    1000  Wireless Buzz! Receiver
 054d  Try Corp.
@@ -6803,6 +6940,8 @@
    2802  Kbd Hub
    3002  Keyboard
    3004  Genius KB-29E
+	3013  BakkerElkhuizen Wired Keyboard S-board 840 Design
+	3020  BakkerElkhuizen Wired Keyboard S-board 840 Design USB-Hub
    3027  Sun-Flex ProTouch
    3107  Keyboard
    3132  Optical mouse M-DY4DR / M-DY6DR
@@ -6873,6 +7012,7 @@
    0093  TPC93
    0097  TPC97
    009a  TPC9A
+	00a2  STU-300B [LCD signature pad]
    00b0  PTZ-430 [Intuos3 (4x5)]
    00b1  PTZ-630 [Intuos3 (6x8)]
    00b2  PTZ-930 [Intuos3 (9x12)]
@@ -6918,6 +7058,7 @@
    00f4  DTK-2400 [Cintiq 24HD] tablet
    00f6  DTH-2400 [Cintiq 24HD touch] touchscreen
    00f8  DTH-2400 [Cintiq 24HD touch] tablet
+	00f9  DTK-2200 [Cintiq 22HD] hub
    00fa  DTK-2200 [Cintiq 22HD] tablet
    00fb  DTU-1031
    0100  TPC100
@@ -6955,8 +7096,8 @@
    033d  CTL-690 [Intuos Draw (M)]
    033e  CTH-690 [Intuos Art (M)]
    0343  DTK-1651
-	0347  Integrated Hub
-	0348  Integrated Hub
+	0347  DTH-W1620 [MobileStudio Pro 16] internal hub
+	0348  DTH-W1620 [MobileStudio Pro 16] external hub
    034a  DTH-W1320 [MobileStudio Pro 13] touchscreen
    034b  DTH-W1620 [MobileStudio Pro 16] touchscreen
    034d  DTH-W1320 [MobileStudio Pro 13] tablet
@@ -6989,6 +7130,16 @@
    038e  DTH-3220 [Cintiq Pro 32] external hub
    038f  DTH-3220 [Cintiq Pro 32] internal hub
    0390  DTK-1660 [Cintiq 16]
+	0392  PTH-460 [Intuos Pro (S)]
+	0396  DTK-1660E
+	0398  DTH-W1320 [MobileStudio Pro 13] tablet
+	0399  DTH-W1620 [MobileStudio Pro 16] tablet
+	039a  DTH-W1320 [MobileStudio Pro 13] touchscreen
+	039b  DTH-W1620 [MobileStudio Pro 16] touchscreen
+	039c  DTH-W1320 [MobileStudio Pro 16] external hub
+	039d  DTH-W1320 [MobileStudio Pro 16] internal hub
+	03aa  DTH-W1620 [MobileStudio Pro 16] tablet
+	03ac  DTH-W1620 [MobileStudio Pro 16] touchscreen
    0400  PenPartner 4x5
    4001  TPC4001
    4004  TPC4004
@@ -7007,6 +7158,7 @@
    0001  Monitor
    0002  HID Monitor Controls
    0003  Device Bay Controller
+	4001  Monitor
 056e  Elecom Co., Ltd
    0002  29UO Mouse
    0057  Micro Grast Pop M-PGDL
@@ -7042,9 +7194,85 @@
    00a4  Blue LED Mouse M-BL06DB
    00a5  M-NV1BR Bluetooth Mouse
    00a7  Blue LED Mouse M-BL08DB
+	00a8  M-BL09DB Mouse
+	00a9  M-BL10UB Mouse
+	00aa  M-BL11DB Mouse
+	00ac  M-A-BL01UL / M-BL15DB Mouse
+	00b4  Track on Glass Mouse M-TG02DL
+	00b5  Track on Glass Mouse M-TG03UL
+	00b6  Track on Glass Mouse M-TG04DL
+	00b8  M-A-BL01UL or M-ASKL2 Mouse
+	00b9  M-A-BL02DB or M-ASKL Mouse
+	00cb  M-BL21DB Mouse
+	00cd  M-XG1UB Mouse
+	00ce  M-XG1DB Mouse
+	00cf  M-XG1BB Bluetooth Mouse
+	00d0  M-XG2UB Mouse
+	00d1  M-XG2DB Mouse
+	00d2  M-XG2BB Bluetooth Mouse
+	00d3  M-XG3DL Mouse
+	00d4  M-LS11DL Mouse
+	00da  M-XG4UB Mouse
+	00db  M-XG4DB Mouse
+	00dc  M-XG4BB Bluetooth Mouse
+	00dd  M-LS12UL Mouse
+	00de  M-LS13UL Mouse
+	00df  M-BL22DB Mouse
+	00e1  M-WK01DB or M-A-BL04DB
+	00e2  M-A-BL03DB
+	00e3  M-XGx10UB
+	00e4  M-XGx10DB
+	00e5  M-XGx10BB
+	00e6  M-XGx20DL or M-XGx20DB UltimateLaser Mouse
+	00f1  M-XT1DRBK USB EX-G Wireless Optical TrackBall
+	00f2  M-XT1URBK EX-G Optical Trackball
+	00f3  M-BL23DB
+	00f4  M-BT13BL LBT-UAN05C2
+	00f7  M-KN1DB
+	00f8  M-BL22DB Mouse (other version)
+	00f9  M-XT2URBK EX-G Optical TrackBall
+	00fa  M-XT2DRBK EX-G Wireless Optical TrackBall
+	00fb  M-XT3URBK EX-G Optical TrackBall
+	00fc  M-XT3DRBK EX-G Wireless Optical TrackBall
+	00fd  M-XT4DRBK EX-G Wireless Optical TrackBall
+	00fe  M-DT1URBK or M-DT2URBK DEFT Optical TrackBall
+	00ff  M-DT1DRBK or M-DT2DRBK DEFT Wireless Optical Mouse
+	0101  M-BL25UBS
+	0103  M-BT16BBS
+	0104  M-BL26UBC
+	0105  M-BL26DBC
+	0107  M-LS15UL
+	0108  M-LS15DL
+	0109  M-LS16UL Mouse
+	010a  M-LS16DL / M-KN2DLS
+	010b  M-BL21DB Mouse
+	010c  M-HT1URBK HUGE Optical TrackBall
+	010d  M-HT1DRBK HUGE Wireless Optical TrackBall
+	010e  M-KS1DBS / M-FPG3DBS
+	010f  M-FBG3DB
+	0115  M-BT13BL
+	0121  M-ED01DB
+	0122  M-NK01DB
+	0124  Dual connect Mouse M-DC01MB Bluetooth
+	0128  TrackBall Mouse M-XPT1MR Wired
+	0129  TrackBall Mouse M-XPT1MR Wireless
+	0130  TrackBall Mouse M-XPT1MR Bluetooth
+	0131  TrackBall Mouse M-DPT1MR Wired
+	0132  TrackBall Mouse M-DPT1MR Wireless
+	0133  TrackBall Mouse M-DPT1MR Bluetooth
+	0136  M-BT20BB
+	0137  BlueTooth 4.0 Mouse M-BT21BB
+	0138  M-A-BL07DB
+	0140  M-G01UR
+	0141  M-Y9UB
+	0142  M-DY13DB
+	0144  M-FBL01DB
+	1055  TK-DCP03 WIRED
+	1057  TK-DCP03 BT
    2003  JC-U3613M
    2004  JC-U3613M
    200c  LD-USB/TX
+	200f  JC-U4013S Gamepad
    2012  JC-U4013S Gamepad
    4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
    4005  LD-USBL/TX
@@ -7199,15 +7427,23 @@
    8501  FRITZ WLAN N v2 [RT5572/rt2870.bin]
 057d  Shark Multimedia, Inc.
 057e  Nintendo Co., Ltd
+	0300  USB-EXI Adapter (GCP-2000)
+	0304  RVT-H Reader
    0305  Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
    0306  Wii Remote Controller RVL-003
    0337  Wii U GameCube Controller Adapter
+	2000  Switch
    2006  Joy-Con L
    2007  Joy-Con R
+	2009  Switch Pro Controller
+	200e  Joy-Con Charging Grip
+	3000  SDK Debugger
 057f  QuickShot, Ltd
    6238  USB StrikePad
 0580  Denron, Inc.
 0581  Racal Data Group
+	0107  Tera Barcode Scanner 2.4 GHz Receiver
+	020c  Tera 2D Barcode Scanner EVHK0012
 0582  Roland Corp.
    0000  UA-100(G)
    0002  UM-4/MPU-64 MIDI Interface
@@ -7371,6 +7607,12 @@
    0159  DUO-CAPTURE EX
    015b  INTEGRA-7
    015d  R-88
+	01b5  Boutique Series Synthesizer (Normal mode)
+	01b6  Boutique Series Synthesizer (Storage mode)
+	01df  Rubix22
+	01e0  Rubix24
+	01e1  Rubix44
+	01ef  Go:KEYS MIDI
    0505  EDIROL UA-101
 0583  Padix Co., Ltd (Rockfire)
    0001  4 Axis 12 button +POV
@@ -7381,6 +7623,7 @@
    2033  RM-203 USB Nest [mode 4]
    2050  PX-205 PSX Bridge
    205f  PSX/USB converter
+	2060  2-axis 8-button gamepad
    206f  USB, 2-axis 8-button gamepad
    3050  QF-305u Gamepad
    3379  Rockfire X-Force
@@ -7523,6 +7766,7 @@
 058e  Tripath Technology, Inc.
 058f  Alcor Micro Corp.
    1234  Flash Drive
+	198b  Webcam (Gigatech P-09)
    2412  SCard R/W CSR-145
    2802  Monterey Keyboard
    5492  Hub
@@ -7541,6 +7785,7 @@
    6387  Flash Drive
    6390  USB 2.0-IDE bridge
    6391  IDE Bridge
+	6998  AU6998 Flash Disk Controller
    9213  MacAlly Kbd Hub
    9215  AU9814 Hub
    9254  Hub
@@ -7570,6 +7815,7 @@
    0004  Cable Modem
    000b  MR56SVS
    0028  HJ-720IT / HEM-7080IT-E / HEM-790IT
+	0051  FT232BM [E58CIFQ1 with FTDI USB2Serial Converter]
 0591  Questra Consulting
 0592  Powerware Corp.
    0002  UPS (X-Slot)
@@ -7648,6 +7894,7 @@
    0421  Big Disk G465
    0525  BigDisk Extreme 500
    0641  Mobile Hard Drive
+	0828  d2 Quadra
    0829  BigDisk Extreme+
    1004  Little Disk 20 GB
    100c  Rugged Triple Interface Mobile Hard Drive
@@ -7658,13 +7905,17 @@
    1021  Little Disk
    1027  iamaKey V2
    102a  Rikiki Hard Drive
+	103d  D2
    1049  rikiki Harddrive
    1052  P'9220 Mobile Drive
+	1053  P'9230 2TB [Porsche Design Desktop Drive 2TB]
    1061  Rugged USB3-FW
    1064  Rugged 16 and 32 GB
    106b  Rugged Mini HDD
    106d  Porsche Design Mobile Drive
    106e  Porsche Design Desktop Drive
+	1094  Rugged THB
+	1095  Rugged
    a601  HardDrive
    a602  CD R/W
 05a0  Vetronix Corp.
@@ -7693,6 +7944,7 @@
    0002  CVA122 Cable Voice Adapter (WDM)
    0003  CVA124E Cable Voice Adapter (WDM)
    0004  CVA122E Cable Voice Adapter (WDM)
+	0008  STA1520 Tuning Adapter
    0a00  Integrated Management Controller Hub
    0a01  Virtual Keyboard/Mouse
    0a02  Virtual Mass Storage
@@ -7702,6 +7954,8 @@
    4001  Bluetooth Headset in DFU mode
    4002  Bluetooth Headset Series 2
    4003  Bluetooth Headset Series 2 in DFU mode
+	400d  SoundLink Color II speaker in DFU mode
+	40fe  SoundLink Color II speaker
    bc50  SoundLink Wireless Mobile speaker
    bc51  SoundLink Wireless Mobile speaker in DFU mode
 05a8  Spacetec IMC Corp.
@@ -7711,6 +7965,7 @@
    0519  OV519 Microphone
    1550  VEHO Filmscanner
    2640  OV2640 Webcam
+	2642  Integrated Webcam for Dell XPS 2010
    2643  Monitor Webcam
    264b  Monitor Webcam
    2800  SuperCAM
@@ -7792,11 +8047,13 @@
    0247  Internal Keyboard/Trackpad (JIS)
    024a  Internal Keyboard/Trackpad (MacBook Air) (ISO)
    024d  Internal Keyboard/Trackpad (MacBook Air) (ISO)
+	024f  Aluminium Keyboard (ANSI)
    0250  Aluminium Keyboard (ISO)
    0252  Internal Keyboard/Trackpad (ANSI)
    0253  Internal Keyboard/Trackpad (ISO)
    0254  Internal Keyboard/Trackpad (JIS)
    0259  Internal Keyboard/Trackpad
+	025a  Internal Keyboard/Trackpad
    0263  Apple Internal Keyboard / Trackpad (MacBook Retina)
    0267  Magic Keyboard A1644
    0269  Magic Mouse 2 (Lightning connector)
@@ -7866,7 +8123,7 @@
    12a4  iPad 3 (wifi)
    12a5  iPad 3 (CDMA)
    12a6  iPad 3 (3G, 16 GB)
-	12a8  iPhone5/5C/5S/6
+	12a8  iPhone 5/5C/5S/6/SE
    12a9  iPad 2
    12aa  iPod Touch 5.Gen [A1421]
    12ab  iPad 4/Mini1
@@ -7874,6 +8131,10 @@
    1301  iPod Shuffle 2.Gen
    1302  iPod Shuffle 3.Gen
    1303  iPod Shuffle 4.Gen
+	1392  Apple Watch charger
+	1393  AirPods case
+	1395  Smart Battery Case [iPhone 6]
+	1398  Smart Battery Case
    1401  Modem
    1402  Ethernet Adapter [A1277]
    1500  SuperDrive [A1379]
@@ -7900,11 +8161,13 @@
    8242  Built-in IR Receiver
    8281  Bluetooth Host Controller
    8286  Bluetooth Host Controller
+	8289  Bluetooth Host Controller
    828c  Bluetooth Host Controller
    8290  Bluetooth Host Controller
    8300  Built-in iSight (no firmware loaded)
    8403  Internal Memory Card Reader
    8404  Internal Memory Card Reader
+	8406  Internal Memory Card Reader
    8501  Built-in iSight [Micron]
    8502  Built-in iSight
    8505  Built-in iSight
@@ -7913,6 +8176,7 @@
    8509  FaceTime HD Camera
    850a  FaceTime Camera
    8510  FaceTime HD Camera (Built-in)
+	8600  iBridge
    911c  Hub in A1082 [Cinema HD Display 23"]
    9127  Hub in Thunderbolt Display
    912f  Hub in 30" Cinema Display
@@ -7945,8 +8209,9 @@
 05b5  Dialogic Corp.
 05b6  Proxima Corp.
 05b7  Medianix Semiconductor, Inc.
-05b8  Agiler, Inc.
+05b8  SYSGRATION
    3002  Scroll Mouse
+	3126  APT-905 Wireless presenter
    3223  ISY Wireless Presenter
 05b9  Philips Research Laboratories
 05ba  DigitalPersona, Inc.
@@ -7968,6 +8233,9 @@
    0008  AccelePort USB 8
 05c6  Qualcomm, Inc.
    0114  Select RW-200 CDMA Wireless Modem
+	0a02  Jolla Device Developer Mode
+	0a07  Jolla Device MTP
+	0afe  Jolla Device Charging Only
    1000  Mass Storage Device
    3100  CDMA Wireless Modem/Phone
    3196  CDMA Wireless Modem
@@ -7982,7 +8250,13 @@
    9003  Quectel UC20
    9008  Gobi Wireless Modem (QDL mode)
    9018  Qualcomm HSUSB Device
-	9025  Qualcomm HSUSB Device
+	9025  HSUSB Device
+	9090  Quectel UC15
+	9091  Intex Aqua Fish & Jolla C Diagnostic Mode
+	9092  Nokia 8110 4G
+	90ba  Audio 1.0 device
+	90bb  Snapdragon interface (MIDI + ADB)
+	90dc  Fairphone 2 (Charging & ADB)
    9201  Gobi Wireless Modem (QDL mode)
    9202  Gobi Wireless Modem
    9203  Gobi Wireless Modem
@@ -7990,7 +8264,7 @@
    9211  Acer Gobi Wireless Modem (QDL mode)
    9212  Acer Gobi Wireless Modem
    9214  Acer Gobi 2000 Wireless Modem (QDL mode)
-	9215  Acer Gobi 2000 Wireless Modem
+	9215  Quectel EC20 LTE modem / Acer Gobi 2000 Wireless Modem
    9221  Gobi Wireless Modem (QDL mode)
    9222  Gobi Wireless Modem
    9224  Sony Gobi 2000 Wireless Modem (QDL mode)
@@ -8004,6 +8278,7 @@
    9265  Asus Gobi 2000 Wireless Modem
    9274  iRex Technologies Gobi 2000 Wireless Modem (QDL mode)
    9275  iRex Technologies Gobi 2000 Wireless Modem
+	f003  Nokia 8110 4G
 05c7  Qtronix Corp.
    0113  PC Line Mouse
    1001  Lynx Mouse
@@ -8014,9 +8289,16 @@
    0103  FO13FF-65 PC-CAM
    010b  Webcam (UVC)
    021a  HP Webcam
+	0233  HP Webcam
    0318  Webcam
    0361  SunplusIT INC. HP Truevision HD Webcam
    036e  Webcam
+	0374  HP EliteBook integrated HD Webcam
+	038e  HP Wide Vision HD integrated webcam
+	03a1  XiaoMi Webcam
+	03b1  Webcam
+	03bc  HP Wide Vision HD Integrated Webcam
+	03cb  HP Wide Vision HD Integrated Webcam
    0403  Webcam
    041b  HP 2.0MP High Definition Webcam
 05c9  Semtech Corp.
@@ -8029,6 +8311,8 @@
    0403  Printing Support
    0405  Type 101
    0406  Type 102
+	0437  Aficio SP 3510SF
+	044e  SP C250SF (multifunction device: printer, scanner, fax)
    1803  V5 camera [R5U870]
    1810  Pavilion Webcam [R5U870]
    1812  Pavilion Webcam
@@ -8047,8 +8331,10 @@
    183b  Visual Communication Camera VGP-VCC8 [R5U870]
    183d  Sony Vaio Integrated Webcam
    183e  Visual Communication Camera VGP-VCC9 [R5U870]
+	183f  Sony Visual Communication Camera Integrated Webcam
    1841  Fujitsu F01/ Lifebook U810 [R5U870]
    1870  Webcam 1000
+	1880  R5U880
    18b0  Sony Vaio Integrated Webcam
    18b1  Sony Vaio Integrated Webcam
    18b3  Sony Vaio Integrated Webcam
@@ -8268,6 +8554,7 @@
    4d02  MP3 Player
    4d12  MP3 Player
    4d30  MP3 Player
+	a201  JumpDrive S70 4GB
    a209  JumpDrive S70
    a300  JumpDrive2
    a400  JumpDrive trade; Pro 40-501
@@ -8307,6 +8594,7 @@
    c753  JumpDrive TwistTurn
    c75c  JumpDrive V10
 05dd  Delta Electronics, Inc.
+	a011  HID UPS Battery
    ff31  AWU-120
    ff32  FriendlyNET AeroLAN AL2011
    ff35  PCW 100 - Wireless 802.11b Adapter
@@ -8351,12 +8639,13 @@
    0502  GL620USB-A GeneLink USB-USB Bridge
    0503  Webcam
    0504  HID Keyboard Filter
+	0510  Camera
    0604  USB 1.1 Hub
-	0605  USB 2.0 Hub
+	0605  Hub
    0606  USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub
    0607  Logitech G110 Hub
    0608  Hub
-	0610  4-port hub
+	0610  Hub
    0612  Hub
    0616  hub
    0660  USB 2.0 Hub
@@ -8378,7 +8667,7 @@
    0711  Card Reader
    0712  Delkin Mass Storage Device
    0715  USB 2.0 microSD Reader
-	0716  USB 2.0 Multislot Card Reader/Writer
+	0716  Multislot Card Reader/Writer
    0717  All-in-1 Card Reader
    0718  IDE/SATA Adapter
    0719  SATA adapter
@@ -8388,12 +8677,13 @@
    0727  microSD Reader/Writer
    0731  GL3310 SATA 3Gb/s Bridge Controller
    0732  All-in-One Cardreader
-	0736  microSD Reader/Writer
+	0736  Colour arc SD Card Reader [PISEN]
    0738  Card reader
    0741  microSD Card Reader
    0743  SDXC and microSDXC CardReader
    0745  Logilink CR0012
    0748  All-in-One Cardreader
+	0749  SD Card Reader and Writer
    0751  microSD Card Reader
    0760  USB 2.0 Card Reader/Writer
    0761  Genesys Mass Storage Device
@@ -8447,6 +8737,7 @@
 05f9  PSC Scanning, Inc.
    1104  Magellan 2200VS
    1206  Gryphon series (OEM mode)
+	120c  Gryphon GD4430-BK
    2202  Point of Sale Handheld Scanner
    2206  Gryphon series (keyboard emulation mode)
    220c  Datalogic Gryphon GD4430
@@ -8467,6 +8758,7 @@
    0251  Raider Pro
    0253  ProPad 8 Digital
    0286  SV-286 Cyclone Digital
+	1007  Mad Catz Controller
    107a  PowerPad Pro X-Box pad
    262a  3dfx HammerHead FX
    262f  HammerHead Fx
@@ -8482,6 +8774,8 @@
    0014  Gamepad
    1010  Optical Wireless
    2001  Microsoft Wireless Receiver 700
+	3030  Controller
+	3031  Controller
 05ff  LeCroy Corp.
 0600  Barco Display Systems
 0601  Jazz Hipster Corp.
@@ -8489,6 +8783,7 @@
 0602  Vista Imaging, Inc.
    1001  ViCam Webcam
 0603  Novatek Microelectronics Corp.
+	0002  Sino Wealth keyboard/mouse 2.4 GHz receiver
    00f1  Keyboard (Labtec Ultra Flat Keyboard)
    00f2  Keyboard (Labtec Ultra Flat Keyboard)
    6871  Mouse
@@ -8512,6 +8807,7 @@
    2101  Keyboard
    2231  KSK-6001 UELX Keyboard
    2270  Gigabyte K8100 Aivia Gaming Keyboard
+	500a  Cougar 500k Gaming Keyboard
    5253  Thermaltake MEKA G-Unit Gaming Keyboard
    5811  ACK-571U Wireless Keyboard
    5903  Japanese Keyboard - 595U
@@ -8565,12 +8861,15 @@
 0622  Iotech, Inc.
 0623  Littelfuse, Inc.
 0624  Avocent Corp.
+	0013  SC Secure KVM
    0248  Virtual Hub
    0249  Virtual Keyboard/Mouse
    0251  Virtual Mass Storage
+	0252  Virtual SD card reader
    0294  Dell 03R874 KVM dongle
    0402  Cisco Virtual Keyboard and Mouse
    0403  Cisco Virtual Mass Storage
+	1774  Cybex SC985
 0625  TiMedia Technology Co., Ltd
 0626  Nippon Systems Development Co., Ltd
 0627  Adomax Technology Co., Ltd
@@ -8579,12 +8878,17 @@
 062a  MosArt Semiconductor Corp.
    0000  Optical mouse
    0001  Notebook Optical Mouse
+	0020  Logic3 Gamepad
+	0033  Competition Pro Steering Wheel
    0102  Wireless Keyboard/Mouse Combo [MK1152WC]
    0201  Defender Office Keyboard (K7310) S Zodiak KM-9010
    0252  Emerge Uni-retractable Laser Mouse
    2410  Wireless PS3 gamepad
    3286  Nano Receiver [Sandstrom Laser Mouse SMWLL11]
    4101  Wireless Keyboard/Mouse
+	4102  Wireless Mouse
+	4106  Wireless Mouse 2.4G
+	4c01  2,4Ghz Wireless Transceiver [for Delux M618 Plus Wireless Vertical Mouse]
    6301  Trust Wireless Optical Mouse MI-4150K
    9003  VoIP Conference Hub (A16GH)
    9004  USR9602 USB Internet Mini Phone
@@ -8607,6 +8911,7 @@
    0a13  AV600U
    0a15  Konica Minolta SC-110
    0a16  Konica Minolta SC-215
+	0a2a  AV220 C2
    0a30  UMAX Astra 6700 Scanner
    0a41  Avision AM3000/MF3000 Series
    0f01  fi-4010CU
@@ -8653,6 +8958,7 @@
 064d  TriTech Microelectronics, Ltd
 064e  Suyin Corp.
    2100  Sony Visual Communication Camera
+	3410  RGBIR Camera
    9700  Asus Integrated Webcam
    a100  Acer OrbiCam
    a101  Acer CrystalEye Webcam
@@ -8661,6 +8967,7 @@
    a110  HP Webcam
    a114  Lemote Webcam
    a116  UVC 1.3MPixel WebCam
+	a127  HP Integrated Webcam
    a136  Asus Integrated Webcam [CN031B]
    a219  1.3M WebCam (notebook emachines E730, Acer sub-brand)
    c107  HP webcam [dv6-1190en]
@@ -8674,6 +8981,7 @@
    e263  HP TrueVision HD Integrated Webcam
    f102  Lenovo Integrated Webcam [R5U877]
    f103  Lenovo Integrated Webcam [R5U877]
+	f207  Lenovo EasyCamera Integrated Webcam
    f209  HP Webcam
    f300  UVC 0.3M Webcam
 064f  WIBU-Systems AG
@@ -8849,6 +9157,7 @@
    82e0  MP3 Player
    8320  TrekStor i.Beat fun
    835d  MP3 Player
+	83b5  Transcend T.sonic 530 MP3 Player
    9000  MP3 Player
    9001  MP3 Player
    9002  MP3 Player
@@ -8880,7 +9189,8 @@
    0600  IDE Bridge
    0610  Onext EG210U MODEM
    0611  AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem
-	2303  PL2303 Serial Port
+	1231  Orico SATA External Hard Disk Drive Lay-Flat Docking Station with USB 3.0 & eSATA interfaces.
+	2303  PL2303 Serial Port / Mobile Action MA-8910P
    2305  PL2305 Parallel Port
    2306  Raylink Bridge Controller
    2307  PL2307 USB-ATAPI4 Bridge
@@ -8894,6 +9204,7 @@
    2515  Flash Disk Embedded Hub
    2517  Flash Disk Mass Storage Device
    2528  Storage device (8gB thumb drive)
+	2571  LG Electronics GE24LU21
    25a1  PL25A1 Host-Host Bridge
    2773  PL2773 SATAII bridge controller
    3400  Hi-Speed Flash Disk with TruePrint AES3400
@@ -8960,6 +9271,8 @@
    3009  Magicolor 2300W
    300b  PagePro 1350W
    300c  PagePro 1300W
+	301b  Develop D 1650iD
+	3023  Develop D 2050iD
    302e  Develop D 1650iD PCL
    3034  Develop D 2050iD PCL
    4001  Dimage 2300
@@ -9003,6 +9316,8 @@
    0500  GameStick 3D
    0501  CH Pro Pedals
    0504  F-16 Combat Stick
+068f  Nihon KOHDEN
+	c00d  MEK-6500
 0690  Golden Bridge Electech, Inc.
 0693  Hagiwara Sys-Com Co., Ltd
    0002  FlashGate SmartMedia Card Reader
@@ -9022,6 +9337,7 @@
    9999  VLxxxx Monitor+Hub
 0699  Tektronix, Inc.
    0347  AFG 3022B
+	0365  TDS 2004B
    036a  TDS 2024B
 069a  Askey Computer Corp.
    0001  VC010 Webcam [pwc]
@@ -9069,7 +9385,8 @@
    0006  Cyborg Gold Joystick
    0109  P880 Pad
    0160  ST290 Pro
-	0200  Xbox Adrenalin Hub
+	0200  Racing Wheel
+	0201  Adrenalin Gamepad
    0241  Xbox Adrenalin Gamepad
    0255  X52 Flight Controller
    040b  P990 Dual Analog Pad
@@ -9125,6 +9442,7 @@
    a2ae  Pro Flight Instrument Panel
    a502  Gaming Mouse
    f518  P3200 Rumble Force Game Pad
+	f51a  P3600
    ff04  R440 Force Wheel
    ff0c  Cyborg Force Rumble Pad
    ff0d  P2600 Rumble Force Pad
@@ -9171,6 +9489,7 @@
    01c9  OKI B430 Mono Printer
    020b  OKI ES4140 Mono Printer
    02bb  OKI PT390 POS Printer
+	0383  MC563 Multifunction Printer
    0a91  B2500MFP (printer+scanner)
    3801  B6100 Laser Printer
 06bd  AGFA-Gevaert NV
@@ -9243,6 +9562,9 @@
    000e  HID Device
    0010  Wireless TouchPad
    0013  DisplayPad
+	009a  Metallica MIS Touch Fingerprint Reader
+	00a2  Metallica MOH Touch Fingerprint Reader
+	00bd  Prometheus MIS Touch Fingerprint Reader
    2970  touchpad
 06cc  Terayon Communication Systems
    0101  Cable Modem
@@ -9310,6 +9632,7 @@
    03aa  CP3020DA
    03ad  CP-9800D/DW
    03ae  CP-9800DW-S
+	0f10  Hori/Namco FlightStick 2
    3b10  P95D
    3b21  CP-9810D/DW
    3b30  CP-D70DW / CP-D707DW
@@ -9317,6 +9640,7 @@
    3b36  CP-D80DW
    3b50  CP-W5000DW
    3b60  CP-D90DW
+	3b80  CP-M1
 06d4  Cisco Systems
 06d5  Toshiba
    4000  Japanese Keyboard
@@ -9527,6 +9851,7 @@
    0231  PS/2 Mouse Port
    0232  Serial On Port
    0240  PS/2 to USB Converter
+	0260  PS/2 Keyboard and Mouse
    0300  BAY-3U1S1P Parallel Port
    0302  Parallel Port
    0900  SVGA Adapter
@@ -9663,18 +9988,46 @@
    c541  ISDN TA 280
 0736  Lorom Industrial Co., Ltd
 0738  Mad Catz, Inc.
+	2215  X-55 Rhino Stick
+	2237  V.1 Stick
+	4506  Wireless Controller
    4507  XBox Device
-	4516  XBox Device
-	4520  XBox Device
-	4526  XBox Device
-	4536  XBox Device
-	4540  XBox Device
-	4556  XBox Device
+	4516  Control Pad
+	4520  Control Pad Pro
+	4522  LumiCON
+	4526  Control Pad Pro
+	4530  Universal MC2 Racing Wheel and Pedals
+	4536  MicroCON
+	4540  Beat Pad
+	4556  Lynx Wireless Controller
    4566  XBox Device
    4576  XBox Device
-	4586  XBox Device
-	4588  XBox Device
+	4586  MicroCON Wireless Controller
+	4588  Blaster
+	45ff  Beat Pad
+	4716  Wired Xbox 360 Controller
+	4718  Street Fighter IV FightStick SE for Xbox 360
+	4726  Xbox 360 Controller
+	4728  Street Fighter IV FightPad for Xbox 360
+	4730  MC2 Racing Wheel for Xbox 360
+	4736  MicroCON for Xbox 360
+	4738  Street Fighter IV Wired Controller for Xbox 360
+	4740  Beat Pad for Xbox 360
+	4743  Beat Pad Pro
+	4758  Arcade Game Stick
+	4a01  FightStick TE 2 for Xbox One
+	6040  Beat Pad Pro
    8818  Street Fighter IV Arcade FightStick (PS3)
+	9871  Portable Drum Kit
+	a109  S.T.R.I.K.E.7 Keyboard
+	a215  X-55 Rhino Throttle
+	b726  Modern Warfare 2 Controller for Xbox 360
+	b738  Marvel VS Capcom 2 TE FightStick for Xbox 360
+	beef  Joytech Neo SE Advanced Gamepad
+	cb02  Saitek Cyborg Rumble Pad
+	cb03  Saitek P3200 Rumble Pad
+	cb29  Saitek Aviator Stick AV8R02
+	f738  Super Street Fighter IV FightStick TE S for Xbox 360
 073a  Chaplet Systems, Inc.
    2230  infrared dongle for remote
 073b  Suncom Technologies
@@ -9689,6 +10042,7 @@
    0522  Pole Display (SPC522-3415 2 x 20 Line Display)
    0624  Pole Display (SP324-3415  4 x 20 Line Display)
 073d  Eutron S.p.a.
+	0000  SmartKey
    0005  Crypto Token
    0007  CryptoIdentity CCID
    0025  SmartKey 3
@@ -9702,6 +10056,7 @@
    200a  ISDN TA [HFC-S]
 0745  Syntech Information Co., Ltd
 0746  Onkyo Corp.
+	4700  Integra MZA-4.7
    5500  SE-U55 Audio Device
 0747  Labway Corp.
 0748  Strong Man Enterprise Co., Ltd
@@ -9718,6 +10073,7 @@
    0002  PS/2 Adapter
 0755  Aureal Semiconductor
 0757  Network Technologies, Inc.
+	0a00  SUN Adapter
 0758  Carl Zeiss Microscopy GmbH
 075b  Sophisticated Circuits, Inc.
    0001  Kick-off! Watchdog
@@ -9793,6 +10149,7 @@
    6003  ColorMunki Smile
    d094  X-Rite DTP94 [Quato Silver Haze Pro]
 0766  Jess-Link Products Co., Ltd
+	0017  Packard Bell Carbon
    001b  Packard Bell Go
    0204  TopSpeed Cyberlink Remote Control
 0767  Tokheim Corp.
@@ -9810,8 +10167,8 @@
    1021  CardMan 1021
    1221  CardMan 1221
    1784  CardMan 6020
-	3021  CardMan 3121
-	3022  CardMan 3021
+	3021  CardMan 3021 / 3121
+	3022  CardMan 3121 (HID Technologies)
    3610  CardMan 3620
    3621  CardMan 3621
    3821  CardMan 3821
@@ -9827,6 +10184,8 @@
    c000  CardMan 3x21 CS
    c001  CardMan 5121 CS
 076c  Partner Tech
+	0204  CD7220 Communications Port
+	0302  RP-600
 076d  Denso Corp.
 076e  Kuan Tech Enterprise Co., Ltd
 076f  Jhen Vei Electronic Co., Ltd
@@ -9840,7 +10199,9 @@
 0776  Inalways Corp.
 0777  Comda Enterprise Corp.
 0778  Volex, Inc.
-0779  Fairchild Semiconductor
+0779  ON Semiconductor (formerly Fairchild)
+	0133  FUSB307B
+	0134  FUSB308B
 077a  Sankyo Seiki Mfg. Co., Ltd
 077b  Linksys
    08be  BEFCMU10 v4 Cable Modem
@@ -9858,6 +10219,10 @@
    07af  iMic
    1016  AirClick
    627a  Radio SHARK
+077e  Softing AG
+	008a  NetLink Compact MPI/Profibus adapter
+	0160  EDICblue
+	0220  VAS5054A
 077f  Well Excellent & Most Corp.
 0780  Sagem Monetel GmbH
    1202  ORGA 900 Smart Card Terminal Virtual Com Port
@@ -9894,14 +10259,18 @@
    5575  Cruzer Glide
    5576  Cruzer Facet
    5577  Cruzer Pop (8GB)
-	557d  Cruzer Force (64GB)
+	557d  Cruzer Force
    5580  SDCZ80 Flash Drive
    5581  Ultra
    5583  Ultra Fit
+	5588  Extreme Pro
+	5589  SD8SB8U512G[Extreme 500]
+	558c  Extreme Portable SSD
    5590  Ultra Dual
    5591  Ultra Flair
    5e10  Encrypted
    6100  Ultra II SD Plus 2GB
+	6500  uSSD 5000
    7100  Cruzer Mini
    7101  Pen Flash
    7102  Cruzer Mini
@@ -9959,8 +10328,11 @@
    a7c1  Storage device (SD card reader)
    a7e8  SDDR-113 MicroMate SDHC Reader
    b2b3  SDDR-103 MobileMate SD+ Reader
+	b2b5  SDDR-104 MobileMate SD+ Reader
    b4b5  SDDR-89 V4 ImageMate 12-in-1 Reader
+	b6b7  SDDR-99 V4 ImageMate 5-in-1 Reader
    b6ba  CF SDDR-289
+	cfc9  SDDR-489 ImageMate Pro Reader
 0782  Trackerball
 0783  C3PO
    0003  LTC31 SmartCard Reader
@@ -9987,6 +10359,7 @@
    0063  LDR Device
    0064  LDR-R Device
    00b3  DVD Multi-plus unit LDR-H443U2
+	00cc  LHD Device
    0105  LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II]
    010c  Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter
    0160  LAN-GTJ/U2A
@@ -10056,8 +10429,8 @@
    0986  AN986 Pegasus Ethernet
    8266  Infineon WildCard-USB Wireless LAN Adapter
    8511  ADM8511 Pegasus II Ethernet
-	8513  AN8513 Ethernet
-	8515  AN8515 Ethernet
+	8513  ADM8513 Pegasus II Ethernet
+	8515  ADM8515 Pegasus II Ethernet
 07aa  Corega K.K.
    0001  Ether USB-T Ethernet [klsi]
    0004  FEther USB-TX Ethernet [pegasus]
@@ -10086,6 +10459,7 @@
    fc01  IDE bridge
    fc02  Cable II USB-2
    fc03  USB2-IDE IDE bridge
+	fc77  Quattro 3.0
    fcd6  Freecom HD Classic
    fcf6  DataBar
    fcf8  Freecom Classic SL Network Drive
@@ -10120,6 +10494,7 @@
    5101  SurfBoard SB5101 Cable Modem
    5120  SurfBoard SB5120 Cable Modem (RNDIS)
    5121  Surfboard 5121 Cable Modem
+	6002  MTR7000 Cable Tuning Adapter
    7030  WU830G 802.11bg Wireless Adapter [Envara WiND512]
 07b3  Plustek, Inc.
    0001  OpticPro 1212U Scanner
@@ -10142,6 +10517,7 @@
    0413  OpticSlim 1200 Scanner
    0601  OpticPro ST24 Scanner
    0800  OpticPro ST48 Scanner
+	0807  OpticFilm 7200 scanner
    0900  OpticBook 3600 Scanner
    090c  OpticBook 3600 Plus Scanner
    0a06  TVcam VD100
@@ -10155,6 +10531,7 @@
    0e08  OpticBook A300 Scanner
    1300  OpticBook 3800 Scanner
    1301  OpticBook 4800 Scanner
+	130f  Bookreader v200
 07b4  Olympus Optical Co., Ltd
    0100  Camedia C-2100/C-3000 Ultra Zoom Camera
    0102  Camedia E-10/C-220/C-50 Camera
@@ -10180,6 +10557,7 @@
    0244  Digital Voice Recorder VN-8500PC
    024f  Digital Voice Recorder DS-7000
    0280  m:robe 100
+	0295  Digital Voice Recorder VN-541PC
 07b5  Mega World International, Ltd
    0017  Joystick
    0213  Thrustmaster Firestorm Digital 3 Gamepad
@@ -10245,6 +10623,7 @@
 07bc  Canon Computer Systems, Inc.
 07bd  Webgear, Inc.
 07be  Veridicom
+	1935  Elektron Music Machines
 07c0  Code Mercenaries Hard- und Software GmbH
    1113  JoyWarrior24F8
    1116  JoyWarrior24F14
@@ -10304,6 +10683,7 @@
    0837  H837 Hybrid ATSC/QAM
    1228  MPEG-2 Capture Device (M038)
    1830  AVerTV Volar Video Capture (H830)
+	1871  TD310 DVB-T/T2/C dongle
    3835  AVerTV Volar Green HD (A835B)
    850a  AverTV Volar Black HD (A850)
    850b  AverTV Red HD+ (A850T)
@@ -10378,6 +10758,10 @@
    0501  Mass Storage
 07cd  Elektor
    0001  USBuart Serial Port
+07ce  Nidec Copal
+	c007  DPB-4000
+	c009  DPB-6000
+	c010  CPB-7000
 07cf  Casio Computer Co., Ltd
    1001  QV-8000SX/5700/3000EX Digicam; Exilim EX-M20
    1003  Exilim EX-S500
@@ -10399,6 +10783,7 @@
    6102  fx-CP400
    6801  PL-40R
    6802  MIDI Keyboard
+	6803  CTK-3500 (MIDI keyboard)
 07d0  Dazzle
    0001  Digital Video Creator I
    0002  Global Village VideoFX Grabber
@@ -10511,8 +10896,11 @@
    0000  FastLane MIDI Interface
    0001  MIDI Interface
    0002  MOTU Audio for 64 bit
+	0004  MicroBook
+	0008  M Series
 07ff  Unknown
    00ff  Portable Hard Drive
+	ffff  Mad Catz Gamepad
 0801  MagTek
    0001  Mini Swipe Reader (Keyboard Emulation)
    0002  Mini Swipe Reader
@@ -10561,6 +10949,8 @@
 081c  Mipsys
 081e  AlphaSmart, Inc.
    df00  Handheld
+081f  Manta
+	e401  MM812
 0822  Reudo Corp.
    2001  IRXpress Infrared Device
 0825  GC Protronics
@@ -10639,6 +11029,7 @@
    1005  Digimax 220
    1009  Digimax V4
    1012  6500 Document Camera
+	103f  Digimax S500
    1058  S730 Camera
    1064  Digimax D830 Camera
    1542  Digimax 50 Duo
@@ -10706,6 +11097,7 @@
    4300  WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
    4301  WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
    5f00  WPN111 802.11g Wireless Adapter [Atheros AR5523]
+	68e1  LB1120-100NAS
    6a00  WG111v2 54 Mbps Wireless [RealTek RTL8187L]
    7100  WN121T RangeMax Next Wireless-N [Marvell TopDog]
    9000  WN111(v1) RangeMax Next Wireless [Marvell 88W8362+88W8060]
@@ -10725,6 +11117,7 @@
    9050  A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
    9051  A6200v2 802.11a/b/g/n/ac (2x2) Wireless Adapter [Realtek RTL8812AU]
    9052  A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]
+	9054  Nighthawk A7000 802.11ac Wireless Adapter AC1900 [Realtek 8814AU]
    a001  PA101 10 Mbps HPNA Home Phoneline RJ-1
    f001  On Networks N300MA 802.11bgn [Realtek RTL8192CU]
 084d  Minton Optic Industry Co., Inc.
@@ -10749,6 +11142,8 @@
 0852  CSEM
 0853  Topre Corporation
    0100  HHKB Professional
+	0119  RealForce 105UB
+	0200  RealForce Compact Keyboard
 0854  ActiveWire, Inc.
    0100  I/O Board
    0101  I/O Board, rev1
@@ -11230,6 +11625,7 @@
 090f  Fujitsu Devices, Inc.
 0910  Alation Systems, Inc.
 0911  Philips Speech Processing
+	0c1c  SpeechMike III
    149a  SpeechMike II Pro Plus LFH5276
    2512  SpeechMike Pro
 0912  Voquette, Inc.
@@ -11284,12 +11680,17 @@
    23cc  nüvi 1350
    2459  GPSmap 62/78 series
    2491  Edge 800
+	2518  eTrex 10
    2519  eTrex 30
    2535  Edge 800
    253c  GPSmap 62sc
    255b  Nuvi 2505LM
+	2613  Edge 200 TWN
    26a1  Nuvi 55
+	2802  fenix 3
+	28db  Drive 5
    47fb  nuviCam
+	4cdb  Fenix 6
 0920  Echelon Co.
    7500  Network Interface
 0921  GoHubs, Inc.
@@ -11297,11 +11698,15 @@
 0922  Dymo-CoStar Corp.
    0007  LabelWriter 330
    0009  LabelWriter 310
+	0013  LabelManager 400
    0019  LabelWriter 400
    001a  LabelWriter 400 Turbo
    0020  LabelWriter 450
+	0400  LabelWriter SE450
    1001  LabelManager PnP
+	8003  M10 Digital Postal Scale
    8004  M25 Digital Postal Scale
+	8009  S250 Digital Postal Scale
 0923  IC Media Corp.
    010f  SIIG MobileCam
 0924  Xerox
@@ -11320,6 +11725,8 @@
 0925  Lakeview Research
    0005  Gamtec.,Ltd SmartJoy PLUS Adapter
    03e8  Wii Classic Controller Adapter
+	1031  WiseGroup Ltd, Gameport Controller
+	1700  PS/SS/N64 Joypad
    3881  Saleae Logic
    8101  Phidgets, Inc., 1-Motor PhidgetServo v2.0
    8104  Phidgets, Inc., 4-Motor PhidgetServo v2.0
@@ -11332,6 +11739,7 @@
 0929  American Biometric Co.
 092a  Toshiba Information & Industrial Sys. And Services
 092b  Sena Technologies, Inc.
+	4210  20S - Bluetooth Motorcycle headset & universal intercom
 092f  Northern Embedded Science/CAVNEX
    0004  JTAG-4
    0005  JTAG-5
@@ -11359,7 +11767,7 @@
    0509  BT EDR Dongle
    0706  PocketPC e740
    0707  Pocket PC e330 Series
-	0708  Pocket PC e350 Series
+	0708  Pocket PC e350 Series
    0709  Pocket PC e750 Series
    070a  Pocket PC e400 Series
    070b  Pocket PC e800 Series
@@ -11379,6 +11787,7 @@
    130c  F3607gw Mobile Broadband Module
    1311  F3607gw v2 Mobile Broadband Module
    1400  Memory Stick 2GB
+	140b  Memory Stick 64GB
    642f  TravelDrive
    6506  TravelDrive 2C
    6507  TravelDrive 2C
@@ -11420,6 +11829,7 @@
    6540  TransMemory Flash Memory
    6544  TransMemory-Mini / Kingston DataTraveler 2.0 Stick
    6545  Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick
+	a002  SunplusIT SATA bridge
 0931  Harmonic Data Systems, Ltd
 0932  Crescentec Corp.
    0300  VideoAdvantage
@@ -11442,6 +11852,7 @@
    003c  Rhythmedics HID Bootloader
 0939  Lumberg, Inc.
    0b15  Toshiba Stor.E Alu 2
+	0b16  Toshiba StorE HDD
 093a  Pixart Imaging, Inc.
    0007  CMOS 100K-R Rev. 1.90
    010e  Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A
@@ -11464,9 +11875,12 @@
    2621  PAC731x Trust Webcam
    2622  Webcam Genius
    2624  Webcam
+	2628  Webcam Genius iLook 300
+	2700  GE 1.3 MP MiniCam Pro
 093b  Plextor Corp.
    0010  Storage Adapter
    0011  PlexWriter 40/12/40U
+	0012  PlexWriter 48/24/48U
    0041  PX-708A DVD RW
    0042  PX-712UF DVD RW
    a002  ConvertX M402U XLOADER
@@ -11510,6 +11924,7 @@
 0951  Kingston Technology
    0008  Ethernet
    000a  KNU101TX 100baseTX Ethernet
+	1539  Iron Key D300 (Virtual CD-ROM and USB Stick)
    1600  DataTraveler II Pen Drive
    1601  DataTraveler II+ Pen Drive
    1602  DataTraveler Mini
@@ -11534,14 +11949,21 @@
    1653  Data Traveler 100 G2 8 GiB
    1656  DataTraveler Ultimate G2
    1660  Data Traveller 108
-	1665  Digital DataTraveler SE9 64GB
-	1666  DataTraveler 100 G3/G4/SE9 G2
+	1665  Digital DataTraveler SE9
+	1666  DataTraveler 100 G3/G4/SE9 G2/50
    1689  DataTraveler SE9
    168a  DataTraveler Micro
    168c  DT Elite 3.0
+	16a4  HyperX 7.1 Audio
    16b3  HyperX Savage
+	16d2  HX-KB4BL1-US [HYPERX Alloy FPS Pro]
+	16d4  HyperX SavageEXO [0382]
+	16d5  DataTraveler Elite G2
+	16df  HyperX QuadCast
+	16e4  HyperX Pulsefire Raid
 0954  RPM Systems Corp.
 0955  NVIDIA Corp.
+	7005  Bootloader
    7018  T186 [Tegra Parker]
    701a  U-Boot running on Tegra
    7020  L4T (Linux for Tegra) running on Tegra
@@ -11549,8 +11971,10 @@
    7100  Tegra Device
    7140  T124 [Tegra K1/Logan 32-bit]
    7210  SHIELD Controller
-	7721  T210 [Tegra Erista]
+	7321  Switch [Tegra Erista] recovery mode
+	7721  T210 [TX1 Tegra Erista] recovery mode
    7820  T20 [Tegra 2] recovery mode
+	7c18  T186 [TX2 Tegra Parker] recovery mode
    b400  SHIELD (debug)
    b401  SHIELD
    cf05  SHIELD Tablet (debug)
@@ -11567,6 +11991,7 @@
    0a07  34411A Multimeter
    1507  33210A Waveform Generator
    1745  Test and Measurement Device (IVI)
+	1f01  N5181A MXG Analog Signal Generator
    2918  U2702A oscilloscope
    fb18  LC Device
 0958  CompuLink Research, Inc.
@@ -11584,10 +12009,13 @@
 0968  Catalyst Enterprises, Inc.
 096e  Feitian Technologies, Inc.
    0005  ePass2000
+	0006  HID Dongle (for OEMs - manufacturer string is "OEM")
    0120  Microcosm Ltd Dinkey
    0305  ePass2000Auto
    0309  ePass3000GM
    0401  ePass3000
+	0405  Zzkey Dongle
+	0608  SC Reader KP382
    0702  ePass3003
    0703  ePass3003Auto
    0802  ePass2000 (G&D STARCOS SPK 2.4)
@@ -11622,6 +12050,7 @@
 0984  Apricorn
    0040  SATA Wire (2.5")
    0200  Hard Drive Storage (TPP)
+	1407  Secure Key 3.0
 0985  cab Produkttechnik GmbH & Co KG
    0045  Mach4/200 Label Printer
    00a3  A3/200 or A3/300 Label Printer
@@ -11636,7 +12065,9 @@
 0996  Integrated Telecom Express, Inc.
 099a  Zippy Technology Corp.
    0638  Sanwa Supply Inc. Small Keyboard
+	2620  Graphics tablet [Polostar PT1001, Zeniq PT1001, Leogics PT1001]
    610c  EL-610 Super Mini Electron luminescent Keyboard
+	6330  SANWA Supply Inc. Slim Keyboard
    713a  WK-713 Multimedia Keyboard
    7160  Hyper Slim Keyboard
 099e  Trimble Navigation, Ltd
@@ -11653,6 +12084,9 @@
    3642  Prism 2.x 802.11b Adapter
 09ab  Japan Cash Machine Co., Ltd.
 09ae  Tripp Lite
+	0002  Any Device (see discussion)
+09b0  Fargo
+	2400  HDP5000
 09b2  Franklin Electronic Publishers, Inc.
    0001  eBookman Palm Computer
 09b3  Altius Solutions, Inc.
@@ -11687,10 +12121,16 @@
 09c1  Arris Interactive LLC
    1337  TOUCHSTONE DEVICE
 09c2  Nisca Corp.
-09c3  ActivCard, Inc.
+09c3  HID Global
    0007  Reader V2
    0008  ZFG-9800-AC SmartCard Reader
    0014  ActivIdentity ActivKey SIM USB Token
+	0028  Crescendo Key
+	0029  Crescendo Key
+	002a  Crescendo Key
+	002b  Crescendo Key
+	002c  Crescendo Key
+	002e  Crescendo Key
 09c4  ACTiSYS Corp.
    0011  ACT-IR2000U IrDA Dongle
 09c5  Memory Corp.
@@ -11705,6 +12145,7 @@
    1007  Ex-Series UVC and MSD interface
    1008  Serial Port
    1996  FLIR ONE Camera
+	4007  Breach
 09cc  Workbit Corp.
    0404  BAFO USB-ATA/ATAPI Bridge Controller
 09cd  Psion Dacom Home Networks, Ltd
@@ -11715,10 +12156,11 @@
 09d2  Vreelin Engineering, Inc.
 09d3  Com One
    0001  ISDN TA / Light Rider 128K
-	000b  Bluetooth Adapter class 1 [BlueLight]
-09d7  NovAtel Inc.
-	0100  NovAtel FlexPack GPS receiver
-09d8  ELATEC
+	000b  Bluetooth Adapter class 2
+09d7  Hexagon NovAtel Inc.
+	0100  GPS/GNSS/SPAN sensor
+09d8  ELATEC GmbH
+	0320  TWN3 Multi125
    0406  TWN4 MIFARE NFC
 09d9  KRF Tech, Ltd
 09da  A4Tech Co., Ltd.
@@ -11732,11 +12174,15 @@
    024f  RF Receiver and G6-20D Wireless Optical Mouse
    0260  KV-300H Isolation Keyboard
    032b  Wireless Mouse (Battery Free)
+	09da  Bloody V8 Mouse
    1068  Bloody A90 Mouse
+	112c  Bloody V5 Mouse
+	3a60  Bloody V8M Core 2 Mouse
    8090  X-718BK Oscar Optical Gaming Mouse
    9033  X-718BK Optical Mouse
    9066  F3 V-Track Gaming Mouse
    9090  XL-730K / XL-750BK / XL-755BK Mice
+	f613  Bloody V7M Mouse
 09db  Measurement Computing Corp.
    0075  MiniLab 1008
    0076  PMD-1024
@@ -11753,6 +12199,7 @@
 09e6  Silutia, Inc.
 09e7  Real 3D, Inc.
 09e8  AKAI  Professional M.I. Corp.
+	0045  MPK Mini Mk II MIDI Controller
    0062  MPD16 MIDI Pad Controller Unit
    006d  EWI electronic wind instrument
    0071  MPK25 MIDI Keyboard
@@ -11895,6 +12342,7 @@
    5024  Mass Storage Device
    5025  Mass Storage Device
 0a4a  Ploytec GmbH
+	a400  AUDIO JUNCTION 2.0
 0a4b  Fujitsu Media Devices, Ltd
 0a4c  Computex Co., Ltd
    15d9  OPTICAL MOUSE
@@ -11944,6 +12392,7 @@
 0a5b  EAsics NV
 0a5c  Broadcom Corp.
    0201  iLine10(tm) Network Adapter
+	0bdc  802.11a/b/g/n/ac Wireless Adapter
    2000  Bluetooth Device
    2001  Bluetooth Device
    2009  BCM2035 Bluetooth
@@ -11997,6 +12446,7 @@
    21e3  HP Portable Valentine
    21e6  BCM20702 Bluetooth 4.0 [ThinkPad]
    21e8  BCM20702A0 Bluetooth 4.0
+	21ec  BCM20702A0 Bluetooth 4.0
    21f1  HP Portable Bumble Bee
    22be  BCM2070 Bluetooth 3.0 + HS
    4500  BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth)
@@ -12021,10 +12471,14 @@
 0a5d  Diatrend Corp.
 0a5f  Zebra
    0009  LP2844 Printer
+	0050  P120i / WM120i
+	0080  GK420d Label Printer
    0081  GK420t Label Printer
+	0084  GX420d Desktop Label Printer
    008b  HC100 wristbands Printer
    008c  ZP 450 Printer
    00d1  Zebra GC420d Label Printer
+	0110  ZD500 Desktop Label Printer
    930a  Printer
 0a62  MPMan
    0010  MPMan MP-F40 MP3 Player
@@ -12058,6 +12512,7 @@
    ff01  Wireless Missile Launcher
 0a82  Syscan
    4600  TravelScan 460/464
+	6605  ScanShell 800N
 0a83  NextComm, Inc.
 0a84  Maui Innovative Peripherals
 0a85  Idexx Labs
@@ -12234,6 +12689,7 @@
    c303  Saturn USB 2.0 Camera
    c326  Namuga 1.3M Webcam
    c33f  Webcam
+	c412  Lenovo IdeaCentre Web Camera
    c429  Lenovo ThinkCentre Web Camera
    c42d  Lenovo IdeaCentre Web Camera
 0ac9  Micro Solutions, Inc.
@@ -12368,6 +12824,7 @@
    1786  USB-N10 802.11n Network Adapter [Realtek RTL8188SU]
    1788  BT-270 Bluetooth Adapter
    1791  WL-167G v3 802.11n Adapter [Realtek RTL8188SU]
+	179c  Bluetooth Adapter
    179d  USB-N53 802.11abgn Network Adapter [Ralink RT3572]
    179e  Eee Note EA800 (network mode)
    179f  Eee Note EA800 (tablet mode)
@@ -12375,6 +12832,7 @@
    17a1  Eee Note EA800 (mass storage mode)
    17ab  USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
    17ba  N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
+	17c2  ROG Spitfire
    17c7  WL-330NUL
    17c9  USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
    17cb  Broadcom BCM20702A0 Bluetooth
@@ -12384,9 +12842,11 @@
    17db  USB-AC50 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U]
    17e8  USB-N14 802.11b/g/n (2x2) Wireless Adapter [Ralink RT5372]
    17eb  USB-AC55 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7612U]
+	17f5  Xonar U5 sound card
    180a  Broadcom BCM20702 Single-Chip Bluetooth 4.0 + LE
    1817  USB-AC68 802.11a/b/g/n/ac (4x4) Wireless Adapter [Realtek RTL8814AU]
    1825  Qualcomm Bluetooth 4.1
+	18f0  Realtek 8188EUS [USB-N10 Nano]
    4c80  Transformer Pad TF300TG
    4c90  Transformer Pad Infinity TF700
    4c91  Transformer Pad Infinity TF700 (Debug mode)
@@ -12418,19 +12878,31 @@
 0b0d  ProjectLab
    0000  CenturyCD
 0b0e  GN Netcom
+	0305  Jabra EVOLVE Link MS
+	0311  Jabra EVOLVE 65
+	0312  enc060:Buttons Volume up/down/mute + phone [Jabra]
+	0343  Jabra UC VOICE 150a
    0348  Jabra UC VOICE 550a MS
    034c  Jabra UC Voice 750 MS
+	034d  Jabra UC VOICE 750
    0410  Jabra SPEAK 410
    0420  Jabra SPEAK 510
+	0422  Jabra SPEAK 510 USB
+	0933  Jabra Freeway
    094d  GN Netcom / Jabra REVO Wireless
    1017  Jabra PRO 930
    1022  Jabra PRO 9450, Type 9400BS (DECT Headset)
    1041  Jabra PRO 9460
    1900  Jabra Biz 1900
    2007  GN 2000 Stereo Corded Headset
+	2456  Jabra SPEAK 810
+	245e  Jabra Link 370
    620c  Jabra BT620s
    9330  Jabra GN9330 Headset
+	a346  Jabra Engage 75 Stereo
+	a50a  Alienware Wireless Gaming Headset AW988
 0b0f  AVID Technology
+	0400  DNxID
 0b10  Pcally
 0b11  I Tech Solutions Co., Ltd
 0b1e  Electronic Warfare Assoc., Inc. (EWA)
@@ -12451,6 +12923,9 @@
    0030  ShuttlePro v2
    0401  RollerMouse Free 2
    0700  RollerMouse Pro
+	08a0  Perfit Mouse
+	1000  RollerMouse Red
+	1010  Vidamic Technomouse IQ
 0b37  Hitachi ULSI Systems Co., Ltd
 0b38  Gear Head
    0003  Keyboard
@@ -12517,6 +12992,7 @@
    0100  D'music MP3 Player
 0b4d  Graphtec America, Inc.
    110a  Graphtec CC200-20
+	1123  Electronic Cutting Tool [Silhouette Portrait]
 0b4e  Musical Electronics, Ltd
    6500  MP3 Player
    8028  MP3 Player
@@ -12589,6 +13065,7 @@
    1720  10/100 Ethernet
    1780  AX88178
    1790  AX88179 Gigabit Ethernet
+	6802  AX68002 KVM Switch SoC
    7720  AX88772
    772a  AX88772A Fast Ethernet
    772b  AX88772B
@@ -12636,6 +13113,7 @@
    0001  Android Phone via mass storage [Wiko Cink Peax 2]
    00ce  mmO2 XDA GSM/GPRS Pocket PC
    00cf  SPV C500 Smart Phone
+	0306  Vive Hub Bluetooth 4.1 (Broadcom BCM920703)
    0a01  PocketPC Sync
    0a02  Himalaya GSM/GPRS Pocket PC
    0a03  PocketPC Sync
@@ -12804,7 +13282,7 @@
    0b2f  Rhodium
    0b51  Qtek 8310 mobile phone [Tornado Noble]
    0bce  Vario MDA
-	0c01  Dream / ADP1 / G1 / Magic / Tattoo
+	0c01  Dream / ADP1 / G1 / Magic / Tattoo / FP1
    0c02  Dream / ADP1 / G1 / Magic / Tattoo (Debug)
    0c03  Android Phone [Fairphone First Edition (FP1)]
    0c13  Diamond
@@ -12820,6 +13298,7 @@
    0c9e  Incredible
    0ca2  Desire HD (debug mode)
    0ca5  Android Phone [Evo Shift 4G]
+	0cab  Desire / Desire HD / Hero / Thunderbolt (HTC Sync Mode)
    0cae  T-Mobile MyTouch 4G Slide [Doubleshot]
    0de5  One (M7)
    0dea  M7_UL [HTC One]
@@ -12827,12 +13306,16 @@
    0f63  Desire 610 Via MTP
    0f64  Desire 601
    0fb4  Remote NDIS based Device
+	0ff0  One Mini (M4)
    0ff8  Desire HD (Tethering Mode)
    0ff9  Desire / Desire HD / Hero / Thunderbolt (Charge Mode)
    0ffe  Desire HD (modem mode)
    0fff  Android Fastboot Bootloader
-	2008  Android Phone via MTP [Wiko Cink Peax 2]
+	2008  Android Phone via MTP [MT65xx]
    200b  Android Phone via PTP [Wiko Cink Peax 2]
+	2134  Vive Hub (SMSC USB2137B)
+	2744  Vive Hub (HTC CB USB2)
+	2c87  Vive
 0bb5  Murata Manufacturing Co., Ltd
 0bb6  Network Alchemy
 0bb7  Joytech Computer Co., Ltd
@@ -12852,6 +13335,7 @@
    2200  FreeAgent Go FW
    2300  Expansion Portable
    231a  Expansion Portable
+	231c  Expansion Portable
    2320  USB 3.0 bridge [Portable Expansion Drive]
    2321  Expansion Portable
    2322  SRD0NF1 Expansion Portable (STEA)
@@ -12860,9 +13344,12 @@
    3008  FreeAgent Desk 1TB
    3101  FreeAgent XTreme 640GB
    3312  SRD00F2 Expansion Desktop Drive (STBV)
+	331a  Desktop HDD 5TB (ST5000DM000)
    3320  SRD00F2 [Expansion Desktop Drive]
    3322  SRD0NF2 [Expansion Desktop Drive]
+	3323  Seagate RSS LLC
    3332  Expansion
+	3343  desktop drive stgy8000400
    5020  FreeAgent GoFlex
    5021  FreeAgent GoFlex USB 2.0
    5030  FreeAgent GoFlex Upgrade Cable STAE104
@@ -12875,20 +13362,26 @@
    5121  FreeAgent GoFlex
    5161  FreeAgent GoFlex dock
    6126  Maxtor D3 Station 5TB
+	61b5  Maxtor HX-M201TCB [M3 Portable 2TB]
    61b6  Maxtor HX-M101TCB/GM [M3 Portable 1TB]
    61b7  Maxtor M3 Portable
    a003  Backup Plus
    a0a1  Backup Plus Desktop
    a0a4  Backup Plus Desktop Drive
+	aa14  STJ4000400 [Seagate Basic Portable Drive 4TB]
    ab00  Slim Portable Drive
    ab1e  Backup Plus Portable Drive
    ab20  Backup Plus Portable Drive
    ab21  Backup Plus Slim
    ab24  Backup Plus Portable Drive
    ab26  Backup Plus Slim Portable Drive 1 TB
+	ab28  Seagate Backup Plus Portable 5TB SRD00F1
+	ab2d  SRD00F1 [Backup Plus Ultra Slim]
    ab31  Backup Plus Desktop Drive (5TB)
    ab34  Backup Plus
-	ab38  Backup Plus Hub
+	ab38  Backup Plus Hub (Mass Storage)
+	ab44  Backup Plus Hub
+	ac20  Backup Plus Slim 2TB
 0bc3  IPWireless, Inc.
    0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -12951,18 +13444,29 @@
    0186  Card Reader
    0301  multicard reader
    0307  Card Reader
+	0316  Card Reader
    0326  Card reader
+	0411  Hub
+	0811  Realtek 8812AU/8821AU 802.11ac WLAN Adapter [USB Wireless Dual-Band Adapter 2.4/5Ghz]
+	0821  RTL8821A Bluetooth
    1724  RTL8723AU 802.11n WLAN Adapter
+	1a2b  RTL8188GU 802.11n WLAN Adapter (Driver CDROM Mode)
    2831  RTL2831U DVB-T
    2832  RTL2832U DVB-T
    2838  RTL2838 DVB-T
    5401  RTL 8153 USB 3.0 hub with gigabit ethernet
+	5411  RTS5411 Hub
+	568c  Integrated Webcam HD
    570c  Asus laptop camera
    5730  HP 2.0MP High Definition Webcam
    5751  Integrated Webcam
    5775  HP "Truevision HD" laptop camera
+	5776  HP Truevision HD integrated webcam
    57b3  Acer 640 × 480 laptop camera
+	57cc  HD Webcam - Realtek Semiconductor
+	57cf  HD WebCam
    57da  Built-In Video Camera
+	58c2  Integrated Webcam HD
    58c8  Integrated Webcam HD
    8150  RTL8150 Fast Ethernet Adapter
    8151  RTL8151 Adapteon Business Mobile Networks BV
@@ -12983,9 +13487,24 @@
    8197  RTL8187B Wireless Adapter
    8198  RTL8187B Wireless Adapter
    8199  RTL8187SU 802.11g WLAN Adapter
+	8723  RTL8723A Bluetooth
    8812  RTL8812AU 802.11a/b/g/n/ac 2T2R DB WLAN Adapter
    8813  RTL8814AU 802.11a/b/g/n/ac Wireless Adapter
+	881a  RTL8812AU-VS 802.11a/b/g/n/ac 2T2R DB WLAN Adapter
+	8821  RTL8821A Bluetooth
+	9210  RTL9210 M.2 NVME Adapter
    a811  RTL8811AU 802.11a/b/g/n/ac WLAN Adapter
+	b009  Realtek Bluetooth 4.2 Adapter
+	b00a  Realtek Bluetooth 4.2 Adapter
+	b00b  Realtek Bluetooth 4.2 Adapter
+	b023  RTL8822BE Bluetooth 4.2 Adapter
+	b711  RTL8188GU 802.11n WLAN Adapter (After Modeswitch)
+	b720  RTL8723BU 802.11b/g/n WLAN Adapter
+	b723  RTL8723B Bluetooth
+	b728  RTL8723B Bluetooth
+	b72a  RTL8723B Bluetooth
+	b812  RTL88x2bu [AC1200 Techkey]
+	f179  RTL8188FTV 802.11b/g/n 1T1R 2.4G WLAN Adapter
 0bdb  Ericsson Business Mobile Networks BV
    1000  BV Bluetooth Device
    1002  Bluetooth Device 1.2
@@ -12998,7 +13517,7 @@
    1909  F3307 v2 Mobile Broadband Module
    190a  F3307 Mobile Broadband Module
    190b  C3607w v2 Mobile Broadband Module
-	1926  H5321 gw Mobile Broadband Driver
+	1926  H5321 gw Mobile Broadband Module
 0bdc  Y Media Corp.
 0bdd  Orange PCS
 0be2  Kanda Tsushin Kogyo Co., Ltd
@@ -13012,6 +13531,7 @@
 0bee  LTK Industries, Ltd
 0bef  Way2Call Communications
 0bf0  Pace Micro Technology PLC
+	c010  EHD100SD
 0bf1  Intracom S.A.
    0001  netMod Driver Ver 2.4.17 (CAPI)
    0002  netMod Driver Ver 2.4 (CAPI)
@@ -13033,6 +13553,8 @@
    100f  miniCard D2301 802.11bg Wireless Module [SiS 163U]
    1017  Keyboard KB SCR
    101f  Fujitsu Full HD Pro Webcam
+0bfb  Grass Valley Group
+	0200  TURBO iDDR Front Panel
 0bfd  Kvaser AB
    0004  USBcan II
    000b  Leaf Light HS
@@ -13048,6 +13570,7 @@
 0c09  Comjet Information System
    a5a5  Litto Version USB2.0
 0c0a  Highpoint Technologies, Inc.
+	6124  RocketStor 6124V
 0c0b  Dura Micro, Inc. (Acomdata)
    27cb  6-in-1 Flash Reader and Writer
    27d7  Multi Memory reader/writer MD-005
@@ -13064,10 +13587,10 @@
    b001  USB 2.0 Mass Storage IDE adapter
    b004  MMC/SD Reader and Writer
 0c12  Zeroplus
-	0005  PSX Vibration Feedback Converter
+	0005  PSX Vibration Feedback Converter / Intec Wireless Controller for Xbox
    0030  PSX Vibration Feedback Converter
    700e  Logic Analyzer (LAP-C-16032)
-	8801  Xbox Controller
+	8801  Nyko Xbox Controller
    8802  Xbox Controller
    8809  Red Octane Ignition Xbox DDR Pad
    880a  Pelican Eclipse PL-2023
@@ -13086,6 +13609,8 @@
 0c1a  Silicon Motion, Inc.
 0c1b  MIPS Technologies
 0c1c  Hang Zhou Silan Electronics Co., Ltd
+0c1f  Magicard
+	1800  Tango 2E
 0c22  Tally Printer Corp.
 0c23  Lernout + Hauspie
 0c24  Taiyo Yuden
@@ -13107,7 +13632,9 @@
    0310  Scream Cam
 0c26  Prolific Technology Inc.
    0018  USB-Serial Controller [Icom Inc. OPC-478UC]
+	002b  Icom Inc. IC-R30
 0c27  RFIDeas, Inc
+	232a  pcProx Plus RFID Reader (CDC serial)
    3bfa  pcProx Card Reader
 0c2e  Metrologic Instruments
    0007  Metrologic MS7120 Barcode Scanner (IBM SurePOS mode)
@@ -13116,6 +13643,7 @@
    0206  Metrologic MS4980 Barcode Scanner
    0700  Metrologic MS7120 Barcode Scanner (uni-directional serial mode)
    0720  Metrologic MS7120 Barcode Scanner (bi-directional serial mode)
+	0a64  [Stratos 2700]
    0b61  Vuquest 3310g
    0b6a  Vuquest 3310 Area-Imaging Scanner
    0b81  Barcode scanner Voyager 1400g Series
@@ -13131,6 +13659,8 @@
 0c3c  Radius Co., Ltd
 0c3d  Innocom, Inc.
 0c3e  Nextcell, Inc.
+0c40  ELMCU
+	8000  2.4GHz receiver
 0c44  Motorola iDEN
    0021  iDEN P2k0 Device
    0022  iDEN P2k1 Device
@@ -13162,6 +13692,9 @@
    1067  Mass Storage Reader
    1158  A56AK
    184c  VoIP Phone
+	1a90  2M pixel Microscope Camera (with capture button) [Andonstar V160]
+	5004  Redragon Mitra RGB Keyboard
+	5101  2.4G Wireless Device [Rii MX3]
    6001  Genius VideoCAM NB
    6005  Sweex Mini Webcam
    6007  VideoCAM Eye
@@ -13259,8 +13792,10 @@
    62e0  MSI Starcam Racer
    6300  PC Microscope camera
    6310  Sonix USB 2.0 Camera
+	6321  HP Integrated Webcam
    6340  Camera
    6341  Defender G-Lens 2577 HD720p Camera
+	6366  Webcam Vitade AF
    63e0  Sonix Integrated Webcam
    63f1  Integrated Webcam
    63f8  Sonix Integrated Webcam
@@ -13274,12 +13809,17 @@
    644d  1.3 MPixel Integrated Webcam
    6480  Sonix 1.3 MP Laptop Integrated Webcam
    648b  Integrated Webcam
+	64ad  Dell Laptop Integrated Webcam HD
    64bd  Sony Visual Communication Camera
    64d0  Integrated Webcam
    64d2  Integrated Webcam
    651b  HP Webcam
+	652f  Backlit Gaming Keyboard
    6705  Integrated HD Webcam
+	670c  Integrated Webcam HD
    6710  Integrated Webcam
+	6712  Integrated Webcam HD
+	671d  Integrated_Webcam_HD
    7401  TEMPer Temperature Sensor
    7402  TEMPerHUM Temperature & Humidity Sensor
    7403  Foot Switch
@@ -13409,6 +13949,7 @@
    1600  Ion Quick Play LP turntable
    1605  SSS Headphone Set
    1607  audio controller
+	5663  Audio Device
 0c77  Sipix Group, Ltd
    1001  SiPix Web2
    1002  SiPix SC2100
@@ -13437,6 +13978,11 @@
 0c99  Innochips Co., Ltd
 0c9a  Hanwool Robotics Corp.
 0c9b  Jobin Yvon, Inc.
+0c9c  Brand Innovators BV
+	1511  BI-1511 Laser Simulator
+	1512  BI-1512 Syncbus Monitor
+	1514  BI-1514 HPC
+	1532  BI-1532 GPC
 0c9d  SemTek
    0170  3873 Manual Insert card reader
 0ca2  Zyfer
@@ -13451,13 +13997,15 @@
    2010  myPad110 PC/SC Smart Card Reader
    3050  EZ710 Smart Card Reader
 0ca7  Information Systems Laboratories
+0caa  Allied Telesis KK.
+	3001  AT-VT-Kit3 Serial Adapter
 0cad  Motorola CGISS
    1007  APX Series Consolette
    1020  MOTOTRBO Series Radio (Portable)
    1030  APX Series Radio (Portable)
    1031  APX Series Radio (Mobile)
    1602  IMPRES Battery Data Reader
-	9001  PowerPad Pocket PC Device
+	9001  PowerPad Pocket PC Device
 0cae  Ascom Business Systems, Ltd
 0caf  Buslink
    2507  Hi-Speed USB-to-IDE Bridge Controller
@@ -13530,10 +14078,12 @@
    00a5  Cinergy Hybrid Stick
    00a9  RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]
    00b3  NOXON DAB/DAB+ Stick
+	00b9  WDR DAB/DAB+ Stick
    00e0  NOXON DAB/DAB+ Stick V2
    0102  Cinergy S2 Stick
    0105  Cinergy S2 Box
    10a7  TerraTec G3
+	10ad   Cinergy H5 Rev. 2
 0cd4  Bang Olufsen
    0101  BeolinkPC2
 0cd5  LabJack Corporation
@@ -13602,6 +14152,7 @@
    0004  AR5523 (no firmware)
    0005  AR5523
    0006  AR5523 (no firmware)
+	0036  AR9462 Bluetooth
    1001  Thomson TG121N [Atheros AR9001U-(2)NG]
    1002  TP-Link TL-WN821N v2 / TL-WN822N v1 802.11n [Atheros AR9170]
    1006  TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]
@@ -13613,13 +14164,16 @@
    3005  AR3011 Bluetooth
    3007  AR3012 Bluetooth 4.0 (no firmware)
    3008  Bluetooth (AR3011)
+	311d  Bluetooth
    311f  AR3012 Bluetooth
    7015  TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]
    9170  AR9170 802.11n
    9271  AR9271 802.11n
+	9378  QCA9377-7
    b002  Ubiquiti WiFiStation 802.11n [Atheros AR9271]
    b003  Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271]
    e006  Dell Wireless 1802 Bluetooth 4.0 LE
+	e300  QCA61x4 Bluetooth 4.0
 0cf4  Fomtex Corp.
 0cf5  Cellink Co., Ltd
 0cf6  Compucable Corp.
@@ -13655,18 +14209,38 @@
    0001  PhotoShuttle
    0002  Photo Printer 730 series
    0004  Photo Printer 63xPL/PS
+	0007  P510K
+	0009  P72x Series
+	000a  P728L
+	000b  P510L
+	000d  P518A
    000e  P910L
+	0010  M610
    0100  Photo Printer 63xPL/PS
    0102  Photo Printer 64xPS
    0103  Photo Printer 730 series
    0104  Photo Printer 63xPL/PS
    0105  Photo Printer 64xPS
+	010e  P510S
+	0110  P110S
+	0111  P510Si
+	0112  P518S
    0200  Photo Printer 64xDL
+	0309  CS-200e
+	030a  CS-220e
+	0501  P75x Series
+	0502  P52x Series
+	0503  P310L
+	050a  P310W
+	050f  P530D
+	0800  X610
 0d17  NALTEC, Inc.
 0d18  coaXmedia
 0d19  Hank Connection Industrial Co., Ltd
 0d28  NXP
    0204  ARM mbed
+0d2f  Andamiro
+	0002  Pump It Up Pad
 0d32  Leo Hui Electric Wire & Cable Co., Ltd
 0d33  AirSpeak, Inc.
 0d34  Rearden Steel Technologies
@@ -13697,6 +14271,7 @@
    0100  Audio
 0d49  Maxtor
    3000  Drive
+	3005  Personal Storage 3000LS
    3010  3000LE Drive
    3100  Hi-Speed USB-IDE Bridge Controller
    3200  Personal Storage 3200
@@ -13720,6 +14295,7 @@
 0d4f  EADS Airbus France
 0d50  Cleware GmbH
    0011  USB-Temp2 Thermometer
+	0030  Multiplexer
    0040  F4 foot switch
 0d51  Volex (Asia) Pte., Ltd
 0d53  HMI Co., Ltd
@@ -13727,6 +14303,8 @@
 0d55  ASKA Technologies, Inc.
 0d56  AVLAB Technology, Inc.
 0d57  Solomon Microtech, Ltd
+0d59  TRC Simulators b.v.
+	02a8  Digital Clock
 0d5c  SMC Networks, Inc.
    a001  SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A]
    a002  SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a]
@@ -13746,6 +14324,7 @@
    2026  TECOM Bluetooth Device
    2050  Mouse
    2106  Dell L20U Multimedia Keyboard
+	910e  HP Business Slim Keyboard
    a100  Optical Mouse
 0d63  Fritz Gegauf AG
 0d64  DXG Technology Corp.
@@ -13815,6 +14394,7 @@
    0001  Audio Device
    0002  Composite Device
    0003  Sound Device
+	0004  CM6631A Audio Processor
    0005  Blue Snowball
    0006  Storm HP-USB500 5.1 Headset
    000c  Audio Adapter
@@ -13918,6 +14498,7 @@
 0da3  Nippon Electro-Sensory Devices Corp.
 0da4  Polar Electro Oy
    0001  Interface
+	0003  FlowLink
    0008  Loop
 0da7  IOGear, Inc.
 0da8  softDSP Co., Ltd
@@ -13962,6 +14543,7 @@
    a97a  Bluetooth EDR Device
    b970  Bluetooth EDR Device
    b97a  Bluetooth EDR Device
+	ffff  Bluetooth Adapter in DFU mode
 0db1  Wen Te Electronics Co., Ltd
 0db2  Shian Hwi Plug Parts, Plastic Factory
 0db3  Tekram Technology Co., Ltd
@@ -13971,6 +14553,7 @@
    013a  Barcode Module - Virtual Keyboard
    013b  Barcode Module - HID
    0160  NFC and Smartcard Module (NSM)
+	0164  NFC and Smartcard Module (NSM)with 4 SAM slots
 0db7  ELCON Systemtechnik
    0002  Goldpfeil P-LAN
 0dba  Digidesign
@@ -14003,6 +14586,7 @@
    0101  Hi-Speed Mass Storage Device
    0209  SK-3500 S2
    020a  Oyen Digital MiniPro 2.5" hard drive enclosure
+	0290  Mass Storage Device [NT2 U3.1]
 0dc5  SDK Co., Ltd
 0dc6  Precision Squared Technology Corp.
    2301  Wireless Touchpad Keyboard
@@ -14017,12 +14601,14 @@
    0003  Mass Storage (P)
 0dd3  MediaQ
 0dd4  Custom Engineering SPA
+	0237  K80 80mm Thermal Printer
 0dd5  California Micro Devices
 0dd7  Kocom Co., Ltd
 0dd8  Netac Technology Co., Ltd
+	0562  Netac Portable SSD Z6s
    1060  USB-CF-Card
    e007  OnlyDisk U222 Pendrive
-	f607  OnlyDisk U208 1G flash drive [U-SAFE]
+	f607  OnlyDisk U210 1G flash drive [U-SAFE]
 0dd9  HighSpeed Surfing
 0dda  Integrated Circuit Solution, Inc.
    0001  Multi-Card Reader 6in1
@@ -14130,7 +14716,9 @@
 0dfa  Toyo Communication Equipment Co., Ltd
 0dfc  GeneralTouch Technology Co., Ltd
    0001  Touchscreen
+	0003  MultiTouch TouchScreen(Dualtouch)
    0101  5-point Touch Screen
+	d107  MultiTouch TouchScreen
 0e03  Nippon Systemware Co., Ltd
 0e08  Winbest Technology Co., Ltd
 0e0b  Amigo Technology Inc.
@@ -14147,6 +14735,7 @@
    0004  Virtual CCID
    0005  Virtual Mass Storage
    0006  Virtual Keyboard
+	000a  Virtual Sensors
    8001  Root Hub
    8002  Root Hub
    8003  Root Hub
@@ -14155,6 +14744,7 @@
 0e17  Walex Electronic, Ltd
 0e1a  Unisys
 0e1b  Crewave
+0e1e  Green Hills Software
 0e20  Pegasus Technologies Ltd.
    0101  NoteTaker
    0200  Seiko Instruments InkLink Handwriting System
@@ -14219,7 +14809,9 @@
 0e4a  Shenzhen Bao Hing Electric Wire & Cable Mfr. Co.
 0e4c  Radica Games, Ltd
    1097  Gamester Controller
-	2390  Games Jtech Controller
+	1103  Gamester Reflex
+	2390  Jtech Controller
+	3510  Gamester for Xbox
    7288  funkey reader
 0e50  TechnoData Interware
    0001  Matrix USB-Key
@@ -14253,6 +14845,7 @@
    0002  Wrist PDA
 0e6a  Megawin Technology Co., Ltd
    0101  MA100 [USB-UART Bridge IC]
+	02c0  Defender Gaming Keyboard
    030b  Truly Ergonomic Computer Keyboard (Device Firmware Update mode)
    030c  Truly Ergonomic Computer Keyboard
    6001  GEMBIRD Flexible keyboard KB-109F-B-DE
@@ -14261,7 +14854,34 @@
    0003  Freebird wireless Controller
    0005  Eclipse wireless Controller
    0006  Edge wireless Controller
+	0008  After Glow Pro Controller
+	0105  Disney's High School Musical 3 Dance Pad for Xbox 360
+	0113  Afterglow AX.1 Gamepad
+	011f  Rock Candy Wired Controller for Xbox 360
    0128  Wireless PS3 Controller
+	0131  PDP EA Sports Controller
+	0133  Wired Controller
+	0139  Afterglow Prismatic Wired Controller for Xbox One
+	013a  PDP Xbox One Controller
+	0146  Rock Candy Wired Controller for Xbox One
+	0147  PDP Marvel Controller for Xbox One
+	015c  PDP Arcade Stick for Xbox One
+	0161  Camo Wired Controller for Xbox One
+	0162  Xbox One Wired Controller
+	0163  Legendary Collection Deliverer of Truth
+	0164  Battlefield 1 Wired Controller for Xbox One
+	0165  Titanfall 2 Wired Controller for Xbox One
+	0201  Pelican PL-3601
+	0213  Afterglow Gamepad for Xbox 360
+	021f  Rock Candy Gamepad for Xbox 360
+	0246  Rock Candy Gamepad for Xbox One
+	0301  Controller
+	0346  Rock Candy Wired Controller for Xbox One
+	0401  Controller
+	0413  Afterglow AX.1 Gamepad for Xbox 360
+	0501  Wired Controller
+	f501  Hi-TEC Essentials Wired Gamepad
+	f900  Afterglow AX.1
 0e70  Tokyo Electronic Industry Co., Ltd
 0e72  Hsi-Chin Electronics Co., Ltd
 0e75  TVS Electronics, Ltd
@@ -14284,16 +14904,21 @@
 0e83  Shin An Wire & Cable Co.
 0e8c  Well Force Electronic Co., Ltd
 0e8d  MediaTek Inc.
+	0002  phone (mass storage mode) [Doro Primo 413]
    0003  MT6227 phone
    0004  MT6227 phone
-	0023  S103
+	0023  S103 / Powertel M6200
    00a5  GSM modem [Medion Surfstick Model:S4222]
    1806  Samsung SE-208 Slim Portable DVD Writer
    1836  Samsung SE-S084 Super WriteMaster Slim External DVD writer
+	1887  Slim Portable DVD Writer
    1956  Samsung SE-506 Portable BluRay Disc Writer
    2000  MT65xx Preloader
+	2008  Cyrus Technology CS 24
    3329  Qstarz BT-Q1000XT
+	7612  MT7612U 802.11a/b/g/n/ac Wireless Adapter
    763e  MT7630e Bluetooth Adapter
+	7668  MT7668 2x2 Dual Band Dual Concurrent 802.11a/b/g/n/ac WiFi with MU-MIMO and Bluetooth 5.0 Radios
 0e8f  GreenAsia Inc.
    0003  MaxFire Blaze2
    0012  Joystick/Gamepad
@@ -14302,6 +14927,7 @@
    0021  Multimedia Keyboard Controller
    0022  multimedia keyboard controller
    0201  SmartJoy Frag Xpad/PS2 adaptor
+	3008  Xbox Controller
    300a  steering Wheel
 0e90  WiebeTech, LLC
    0100  Storage Adapter V1
@@ -14324,6 +14950,7 @@
    2126  7-in-1 Card Reader
    2153  SD Card Reader Key
    2168  Transcend JetFlash 2.0 / Astone USB Drive / Intellegent Stick 2.0
+	2213  WinDroid N287 AH7N2502.013317
    6803  OTI-6803 Flash Disk
    6808  OTI-6808 Flash Disk
    6828  OTI-6828 Flash Disk
@@ -14344,7 +14971,7 @@
 0eb7  Endor AG
 0eb8  Mettler Toledo
    2200  Ariva Scale
-	f000  PS60 Scale
+	f000  BC60 Scale
 0ebb  Thermo Fisher Scientific
    0002  FT-IR Spectrometer
 0ebe  VWeb Corp.
@@ -14386,10 +15013,13 @@
 0eee  Digital Stream Technology, Inc.
    8810  Mass Storage Drive
 0eef  D-WAV Scientific Co., Ltd
-	0001  eGalax TouchScreen
+	0001  Titan6001 Surface Acoustic Wave Touchscreen Controller [eGalax]
    0002  Touchscreen Controller(Professional)
    7200  Touchscreen Controller
+	7904  Multitouch Capacitive Touchscreen eGalaxTouch EXC7904-21v00_T13 [IIyama Prolite T1932-MSC]
    a802  eGalaxTouch EXC7920
+	b10e  eGalaxTouch EXC3000
+	c000  Multitouch Capacitive Touchscreen eGalaxTouch EXC3188-4643-08.00.00.00 Sirius_4643 PCAP3188UR Series [IIyama Prolite PLT1932MSC]
 0ef0  Hitachi Cable, Ltd
 0ef1  Aichi Micro Intelligent Corp.
 0ef2  I/O Magic Corp.
@@ -14408,7 +15038,17 @@
 0f08  CSL Wire & Plug (Shen Zhen) Co.
 0f0c  CAS Corp.
 0f0d  Hori Co., Ltd
+	000a  Dead or Alive 4 FightStick for Xbox 360
+	000c  Horipad EX Turbo for Xbox 360
+	000d  Fighting Stick EX2 for Xbox 360
    0011  Real Arcade Pro 3
+	0016  Real Arcade Pro.EX for Xbox 360
+	001b  Real Aracde Pro.VX
+	0063  Real Arcade Pro Hayabusa for Xbox One
+	0067  Horipad One
+	0078  Real Arcade Pro V Kai for Xbox One / Xbox 360
+	0090  Horipad Ultimate
+	00c1  HORIPAD for Nintendo Switch
 0f0e  Energy Full Corp.
 0f0f  Silego Technology Inc
    0006  GreenPak Universal Dev Board (Active Mode)
@@ -14454,14 +15094,18 @@
 0f2f  Priva Design Services
 0f30  Jess Technology Co., Ltd
    001c  PS3 Guitar Controller Dongle
+	010b  Philips Recoil
    0110  Dual Analog Rumble Pad
    0111  Colour Rumble Pad
+	0202  Joytech Advanced Controller
    0208  Xbox & PC Gamepad
+	8888  BigBen XBMiniPad Controller
 0f31  Chrysalis Development
 0f32  YFC-BonEagle Electric Co., Ltd
 0f37  Kokuyo Co., Ltd
 0f38  Nien-Yi Industrial Corp.
 0f39  TG3 Electronics
+	0404  Recreated ZX Spectrum Keyboard
    0876  Keyboard [87 Francium Pro]
    1086  DK2108SZ Keyboard [Ducky Zero]
 0f3d  Airprime, Incorporated
@@ -14473,6 +15117,8 @@
    ef12  Patriot
    ff11  Liberty (firmware not loaded)
    ff12  Liberty
+0f49  Evolis SA
+	0a00  Zenius
 0f4b  St. John Technology Co., Ltd
 0f4c  WorldWide Cable Opto Corp.
 0f4d  Microtune, Inc.
@@ -14513,15 +15159,17 @@
 0f69  Dionex Corp.
 0f6a  Vibren Technologies, Inc.
 0f6e  INTELLIGENT SYSTEMS
-	0100  GameBoy Color Emulator
+	0100  IS-CGB-EMULATOR
    0201  GameBoy Advance Flash Gang Writer
-	0202  GameBoy Advance Capture
-	0300  Gamecube DOL Viewer
-	0400  NDS Emulator
-	0401  NDS UIC
-	0402  NDS Writer
-	0403  NDS Capture
-	0404  NDS Emulator (Lite)
+	0202  IS-AGB-CAPTURE
+	0300  IS-DOL-VIEWER
+	0400  IS-NITRO-EMULATOR
+	0401  IS-NITRO-UIC
+	0402  IS-NITRO-WRITER
+	0403  IS-NITRO-CAPTURE
+	0404  IS-NITRO-EMULATOR (DS Lite)
+	0500  IS-TWL-DEBUGGER
+	0501  IS-TWL-CAPTURE
 0f73  DFI
 0f78  Guntermann & Drunck GmbH
 0f7c  DQ Technology, Inc.
@@ -14573,6 +15221,7 @@
    8007  Blackberry Handheld
    8010  Blackberry Playbook (Connect to Windows mode)
    8011  Blackberry Playbook (Connect to Mac mode)
+	8014  Blackberry Handheld Z30
    8020  Blackberry Playbook (CD-Rom mode)
    8037  Blackberry PRIV
 0fce  Sony Ericsson Mobile Communications AB
@@ -14595,7 +15244,9 @@
    01a7  D5503
    01ba  D6603 [Xperia Z3]
    01bb  D5803 [Xperia Z3 Compact] (MTP mode)
-	0dde  Xperia Mini Pro Bootloader
+	01e0  F5122 [Xperia X dual] (MTP mode)
+	01e8  F5321 [Xperia X Compact] (MTP mode)
+	01f9  H8314 [Xperia XZ2 Compact]
    1010  WMC Modem
    10af  V640i Phone [PictBridge]
    10d4  C902 Phone [PictBridge]
@@ -14612,14 +15263,21 @@
    5177  Xperia Ion [Debug Mode]
    518c  C1605 [Xperia E dual] MTD mode
    51a7  D5503 (Xperia Z1 Compact)
+	51e0  F5122 [Xperia X dual] (developer mode)
    614f  Xperia X12 (debug mode)
    6166  Xperia Mini Pro
    618c  C1605 [Xperia E dual] MSC mode
    715a  Xperia Pro [Tethering]
    7166  Xperia Mini Pro (Tethering mode)
    7177  Xperia Ion [Tethering]
+	71f4  G8441 (Xperia XZ1 Compact) [Tethering]
+	71f9  H8314 [Xperia XZ2 Compact] (Tethering)
    8004  9000 Phone [Mass Storage]
+	81f4  G8441 (Xperia XZ1 Compact) [Tethering]
    adde  C2005 (Xperia M dual) in service mode
+	c1e0  F5122 [Xperia X dual] (MIDI mode)
+	c1e8  F5321 [Xperia X Compact] (MIDI mode)
+	c1f9  H8314 [Xperia XZ2 Compact] (MIDI)
    d008  V800-Vodafone 802SE Phone
    d016  K750i Phone
    d017  K608i Phone
@@ -14634,6 +15292,7 @@
    d046  K610i Phone
    d065  W960i Phone (PC Suite)
    d076  W910i (Phone mode)
+	d079  K530 Phone
    d089  W580i Phone (mass storage)
    d0a1  K810
    d0af  V640i Phone
@@ -14702,12 +15361,17 @@
    002c  EyeTV DTT Deluxe v2
    0033  Video Capture
    0037  Video Capture v2
+	0060  Stream Deck
+	0063  Stream Deck Mini
+	006c  Stream Deck XL
+	006d  Stream Deck original V2
 0fda  Quantec Networks GmbH
    0100  quanton flight control
 0fdc  Micro Plus
 0fde  Oregon Scientific
    ca01  WMRS200 weather station
    ca05  CM160
+	ca08  WMR300 Professional Weather System
 0fe0  Osterhout Design Group
    0100  Bluetooth Mouse
    0101  Bluetooth IMU
@@ -14737,6 +15401,7 @@
 0ff7  CHI SHING Computer Accessories Co., Ltd
 0ffc  Clavia DMI AB
    0021  Nord Stage 2
+	002a  Nord Piano 4
 0ffd  EarlySense
    ff00  OEM
 0fff  Aopen, Inc.
@@ -14746,6 +15411,7 @@
 1003  Sigma Corp.
    0003  SD14
    0100  SD9/SD10
+	8781  Dock UD-01
 1004  LG Electronics, Inc.
    1fae  U8120 3G Cellphone
    6000  Various Mobile Phones
@@ -14763,13 +15429,14 @@
    61fe  Optimus Android Phone [USB tethering mode]
    627f  G3 (VS985) Android Phone (MTP/Download mode)
    6300  G2/Optimus Android Phone [Charge mode]
-	631c  G2/Optimus Android Phone [MTP mode]
+	631c  LM-X420xxx/G2/Optimus Android Phone (charge mode)
    631d  Optimus Android Phone (Camera/PTP Mode)
-	631e  G2/Optimus Android Phone [Camera/PTP mode]
+	631e  LM-X420xxx/G2/Optimus Android Phone (PTP/camera mode)
    631f  Optimus Android Phone (Charge Mode)
    633a  Ultimate 2 Android Phone L41C
-	633e  G2/G3 Android Phone [MTP/PTP/Download mode]
-	6344  G2 Android Phone [tethering mode]
+	633e  LM-X420xxx/G2/G3 Android Phone (MTP/download mode)
+	6344  LM-X420xxx/G2 Android Phone (USB tethering mode)
+	6348  LM-X420xxx Android Phone (MIDI mode)
    6356  Optimus Android Phone [Virtual CD mode]
    6800  CDMA Modem
    7000  LG LDP-7024D(LD)USB
@@ -14780,6 +15447,7 @@
    1004  MP3 Player
    1006  MP3 Player
    b113  Handy Steno/AH123 / Handy Steno 2.0/HT203
+	b155  Disk Module
    b223  CD-RW + 6in1 Card Reader Digital Storage / Converter
 1006  iRiver, Ltd.
    3001  iHP-100
@@ -14814,13 +15482,14 @@
 1015  Softronics Pty., Ltd
 1016  Xiamen Hung's Enterprise Co., Ltd
 1017  Speedy Industrial Supplies, Pte., Ltd
+	9015  M625 [Vendor: DELUX]
 1019  Elitegroup Computer Systems (ECS)
    0c55  Flash Reader, Desknote UCR-61S2B
    0f38  Infrared Receiver
 1020  Labtec
    0006  Wireless Keyboard
    000a  Wireless Optical Mouse
-	0106  Wireless Optical Mouse
+	0106  Wireless Optical Mouse/Keyboard
 1022  Shinko Shoji Co., Ltd
 1025  Hyper-Paltek
    005e  USB DVB-T device
@@ -14836,6 +15505,7 @@
 102c  Etoms Electronics Corp.
    6151  Q-Cam Sangha CIF
    6251  Q-Cam VGA
+	ff0c  Joytech Wireless Advanced Controller
 102d  Winic Corp.
 1031  Comax Technology, Inc.
 1032  C-One Technology Corp.
@@ -14843,7 +15513,10 @@
    0068  3,5'' HDD case MD-231
 1038  SteelSeries ApS
    0100  Ideazon Zboard
+	1260  Arctis 7 wireless adapter
    1361  Ideazon Sensei
+	1410  SRW-S1 [Simraceway Steering Wheel]
+	1720  Mouse
 1039  devolo AG
    0824  1866 802.11bg [Texas Instruments TNETW1450]
    2140  dsl+ 1100 duo
@@ -14885,6 +15558,7 @@
 104c  AMCO TEC International, Inc.
 104d  Newport Corporation
    1003  Model-52 LED Light Source Power Supply and Driver
+	3001  ESP301 3 Axis Motion Controller
 104f  WB Electronics
    0001  Infinity Phoenix
    0002  Smartmouse
@@ -14906,13 +15580,13 @@
    0120  Yubikey Touch U2F Security Key
    0200  Gnubby U2F
    0211  Gnubby
-	0401  Yubikey 4 OTP
-	0402  Yubikey 4 U2F
-	0403  Yubikey 4 OTP+U2F
-	0404  Yubikey 4 CCID
-	0405  Yubikey 4 OTP+CCID
-	0406  Yubikey 4 U2F+CCID
-	0407  Yubikey 4 OTP+U2F+CCID
+	0401  Yubikey 4/5 OTP
+	0402  Yubikey 4/5 U2F
+	0403  Yubikey 4/5 OTP+U2F
+	0404  Yubikey 4/5 CCID
+	0405  Yubikey 4/5 OTP+CCID
+	0406  Yubikey 4/5 U2F+CCID
+	0407  Yubikey 4/5 OTP+U2F+CCID
    0410  Yubikey plus OTP+U2F
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
@@ -14979,15 +15653,25 @@
    1123  My Book 3.0 (WDBABP)
    1130  My Book Essential (WDBACW)
    1140  My Book Essential (WDBACW)
+	1170  My Book Essential 3TB (WDBACW0030HBK)
    1230  My Book (WDBFJK)
    1235  My Book (WDBFJK0040HBK)
    2599  My Passport Ultra (WD40NMZW)
    259d  My Passport Ultra (WDBBKD)
    259f  My Passport Ultra (WD10JMVW)
-	25a1  Elements / My Passport (WD20NMVW)
+	25a1  Elements / My Passport
    25a2  Elements 25A2
    25a3  Elements Desktop (WDBWLG)
+	25da  My Book (WDBFJK)
+	25e1  My Passport (WD20NMVW)
    25e2  My Passport (WD40NMZW)
+	25ee  My Book 25EE
+	25f3  My Passport SSD (WDBK3E)
+	25fa  easystore Portable 5TB (WDBKUZ0050)
+	25fb  easystore Desktop (WDBCKA)
+	2603  My Passport Game Storage for PS4 4TB (WDBZGE0040)
+	2624  easystore Portable 5TB (WDBKUZ0050)
+	2626  My Passport (WDBPKJ)
    30a0  SATA adapter cable
 1059  Giesecke & Devrient GmbH
    000b  StarSign Bio Token 3.0
@@ -15132,13 +15816,17 @@
 108b  Grand-tek Technology Co., Ltd
    0005  HID Keyboard/Mouse PS/2 Translator
 108c  Robert Bosch GmbH
+	017e  GTC 400 C
 108e  Lotes Co., Ltd.
 1091  Numerik Jena
    8101  Absoflex
 1099  Surface Optics Corp.
 109a  DATASOFT Systems GmbH
 109b  Hisense
+	9109  CROSSCALL Trekker-M1 Core (MTP-Mode)
    9118  Medion P4013 Mobile
+	9119  CROSSCALL Trekker-M1 Core (PTP-Mode)
+	f009  CROSSCALL Trekker-M1 Core (CD-ROM-Mode)
 109f  eSOL Co., Ltd
    3163  Trigem Mobile SmartDisplay84
    3164  Trigem Mobile SmartDisplay121
@@ -15289,6 +15977,8 @@
    0019  Shinko/Sinfonia CHC-S6145
    001d  Shinko/Sinfonia CHC-S6245
    001e  Ciaat Brava 21
+	0039  Sinfonia CHC-S2245
+	10ce  Sinfonia CHC-S2245
    ea6a  MobiData EDGE USB Modem
 10cf  Velleman Components, Inc.
    2011  R-Engine MPEG2 encoder/decoder
@@ -15307,6 +15997,7 @@
    0004  PS/2 Converter
    5552  KVM Human Interface Composite Device (Keyboard/Mouse ports)
    55a2  2Port KVMSwitcher
+	5a08  Dual Bay Docking Station
 10d6  Actions Semiconductor Co., Ltd
    0c02  BioniQ 1001 Tablet
    1000  MP3 Player
@@ -15333,6 +16024,34 @@
    1a2e  HP Truevision HD Integrated Webcam
 10f5  Turtle Beach
    0200  Audio Advantage Roadie
+	0231  Ear Force P11 Headset
+	10f5  EarForce PX21 Gaming Headset
+10f8  Cesys GmbH
+	3201  CeboLC
+	3202  CeboStick
+	3203  CeboMSA64
+	3204  CeboDFN
+	3205  PSAA2304W_CASC
+	c401  USBV4F unconfigured
+	c402  EFM01 unconfigured
+	c403  MISS2 unconfigured
+	c404  CID unconfigured
+	c405  USBS6 unconfigured
+	c406  OP_MISS2 unconfigured
+	c407  NanoUsb uncofigured
+	c481  USBV4F
+	c482  EFM01
+	c483  MISS2
+	c484  CID
+	c485  USBS6
+	c486  OP_MISS2
+	c487  NanoUsb
+	c501  EFM02 unconfigured
+	c502  EFM02/B unconfigured
+	c503  EFM03 unconfigured
+	c581  EFM02
+	c582  EFM02/B
+	c583  EFM03
 10fb  Pictos Technologies, Inc.
 10fd  Anubis Electronics, Ltd
    7e50  FlyCam Usb 100
@@ -15347,6 +16066,8 @@
    0001  FSK Electronics Super GSM Reader
 1108  Brightcom Technologies, Ltd
 110a  Moxa Technologies Co., Ltd.
+	1110  UPort 1110
+	1150  UPort 1150 1-Port RS-232/422/485
    1250  UPort 1250 2-Port RS-232/422/485
    1251  UPort 1250I 2-Port RS-232/422/485 with Isolation
    1410  UPort 1410 4-Port RS-232
@@ -15383,8 +16104,10 @@
 1130  Tenx Technology, Inc.
    0001  BlyncLight
    0002  iBuddy
+	0004  iBuddy Twins
    0202  Rocket Launcher
    6604  MCE IR-Receiver
+	6606  U+P Mouse
    660c  Foot Pedal/Thermometer
    6626  Key
    6806  Keychain photo frame
@@ -15510,9 +16233,13 @@
    9008  Gobi 2000 Wireless Modem
    9009  Gobi 2000 Wireless Modem
    900a  Gobi 2000 Wireless Modem
+	9011  MC8305 Modem
    9013  Sierra Wireless Gobi 3000 Modem device (MC8355)
+	9041  EM7305 Modem
    9055  Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode)
    9057  Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode)
+	9071  AirPrime MC7455 3G/4G LTE Modem
+	9079  EM7455
 119a  ZHAN QI Technology Co., Ltd
 119b  ruwido austria GmbH
    0400  Infrared Keyboard V2.01
@@ -15528,13 +16255,17 @@
    6565  FuelBand
 11b0  ATECH FLASH TECHNOLOGY
    6208  PRO-28U
+	6298  Kingston SNA-DC/U
 11be  R&D International NV
    f0a0  Martin Maxxyz DMX
 11c0  Betop
    5506  Gamepad
 11c5  Inmax
    0521  IMT-0521 Smartcard Reader
+11c9  Nacon
+	55f0  GC-100XF
 11ca  VeriFone Inc
+	0201  MX870/MX880
    0207  PIN Pad VX 810
    0220  PIN Pad VX 805
 11db  Topfield Co., Ltd.
@@ -15556,6 +16287,21 @@
    0140  TTP-245C
 1209  Generic
    0001  pid.codes Test PID
+	0002  pid.codes Test PID
+	0003  pid.codes Test PID
+	0004  pid.codes Test PID
+	0005  pid.codes Test PID
+	0006  pid.codes Test PID
+	0007  pid.codes Test PID
+	0008  pid.codes Test PID
+	0009  pid.codes Test PID
+	000a  pid.codes Test PID
+	000b  pid.codes Test PID
+	000c  pid.codes Test PID
+	000d  pid.codes Test PID
+	000e  pid.codes Test PID
+	000f  pid.codes Test PID
+	0010  pid.codes Test PID
    01c0  Input Club Kiibohd Device
    01cb  Input Club Kiibohd Device Bootloader
    0256  Schwalm & Tate LLC pISO Raspberry Pi Hat
@@ -15582,7 +16328,7 @@
    2016  Cupkee
    2017  Benjamin Shockley Mini SAM
    2020  Captain Credible Gate Crystal
-	2048  Housedillon.com MRF49XA Transciever
+	2048  Housedillon.com MRF49XA Transceiver
    2100  TinyFPGA B1 and B2 Boards
    2101  TinyFPGA A-Series Programmer
    2200  Dygma Shortcut Bootloader
@@ -15615,6 +16361,8 @@
    317e  Codecrete Wirekite
    3210  OSH Lab, LLC Magic Keys
    3333  LabConnect Digitalnetzteil
+	345b  kinX Hub
+	345c  kinX Keyboard Controller
    3690  Kigakudoh TouchMIDI32
    4096  CynaraKrewe Cynara
    414c  Adi Linden
@@ -15638,6 +16386,8 @@
    5038  frotz.net mdebug rswd protocol
    5039  frotz.net lpcboot protocol
    5050  trebb ISO50
+	5070  SoloHacker security key [SoloKey]
+	50b0  boot for security key [SoloKey]
    5222  telavivmakers attami
    53c0  SatoshiLabs TREZOR Bootloader
    53c1  SatoshiLabs TREZOR
@@ -15668,6 +16418,11 @@
    7551  The Tessel Project Tessel 2
    7777  circuitvalley IO Board V3
    7778  circuitvalley IO Board V3 Bootloader
+	7950  PIC18F87J94 Bootloader [GenII]
+	7951  PIC18F87J94 Application [GenII]
+	7952  PIC18F87J94 Bootloader [GenIII/IV]
+	7953  PIC18F87J94 Application [GenIII/IV]
+	7954  PIC18F87J94 Application [GenIII/IV]
    7bd0  pokey9000 Tiny Bit Dingus
    8000  Autonomii NODii 2
    8086  MisfitTech Nano Zero Bootloader
@@ -15767,6 +16522,7 @@
    dead  chaosfield.at AVR-Ruler
    deaf  CrapLab 4chord MIDI
    ded1  ManCave Made Quark One
+	deed  Kroneum Time Tracker
    df00  D.F.Mac. @TripArts Music mi:muz:tuch
    df01  D.F.Mac. @TripArts Music mi:muz:can
    df02  D.F.Mac. @TripArts Music mi:muz:can-lite
@@ -15804,11 +16560,21 @@
    524e  RoadMate 1475T
    5260  Triton Handheld GPS Receiver (300/400/500/1500/2000)
 1210  DigiTech
+	000d  RP250 Guitar Multi-Effects Processor
    0016  RP500 Guitar Multi-Effects Processor
    001b  RP155 Guitar Multi-Effects Processor
    001c  RP255 Guitar Multi-Effects Processor
 121e  Jungsoft Co., Ltd
    3403  Muzio JM250 Audio Player
+121f  Panini S.p.A.
+	0001  VisionX without Firmware
+	0002  VisionX with Firmware
+	0010  I-Deal
+	0020  wI-Deal
+	0021  VisionX Page Scanner Extension
+	0030  VisionNext
+	0040  mI:Deal Check Scanner
+	0041  EverNext Check Scanner
 1220  TC Electronic
    000a  Hall of Fame Reverb
    002a  Polytune
@@ -15816,6 +16582,8 @@
    0039  Alter Ego X4 Vintage Echo
 1221  Unknown manufacturer
    3234  Disk (Thumb drive)
+1222  TiPro
+	faca  programmable keyboard
 1223  SKYCABLE ENTERPRISE. CO., LTD.
 1228  Datapaq Limited
    0012  Q18 Data Logger
@@ -15853,6 +16621,9 @@
    0019  Impulse 25
    001a  Impulse 49
    001b  Impulse 61
+	0032  Launchkey 61
+	0069  Launchpad MK2
+	0102  LaunchKey Mini MK3
    4661  ReMOTE25
    8000  Scarlett 18i6
    8002  Scarlett 8i6
@@ -15865,8 +16636,13 @@
    8012  Scarlett 6i6
    8014  Scarlett 18i8
    8016  Focusrite Scarlett 2i2
+	8202  Focusrite Scarlett 2i2 2nd Gen
    8203  Focusrite Scarlett 6i6
    8204  Scarlett 18i8 2nd Gen
+	8210  Scarlett 2i2 Camera
+	8211  Scarlett Solo (3rd Gen.)
+	8214  Scarlett 18i8 3rd Gen
+	8215  Scarlett 18i20 3rd Gen
 1241  Belkin
    0504  Wireless Trackball Keyboard
    1111  Mouse
@@ -15877,6 +16653,8 @@
    1503  Keyboard
    1603  Keyboard
    f767  Keyboard
+1243  Holtek Semiconductor, Inc.
+	e000  Unique NFC/RFID reader (keyboard emulation)
 124a  AirVast
    168b  PRISM3 WLAN Adapter
    4017  PC-Chips 802.11b Adapter
@@ -15888,11 +16666,14 @@
    3200  Stealth MXP 1GB
 125c  Apogee Inc.
    0010  Alta series CCD
+125d  JMicron
+	0580  JM580
 125f  A-DATA Technology Co., Ltd.
    312a  Superior S102
    312b  Superior S102 Pro
    a15a  DashDrive Durable HD710 portable HDD various size
    a22a  DashDrive Elite HE720 500GB
+	a31a  HV620 Portable HDD
    a91a  Portable HDD CH91
    c08a  C008 Flash Drive
    c81a  Flash drive
@@ -15923,6 +16704,7 @@
 1275  Xaxero Marine Software Engineering, Ltd.
    0002  WeatherFax 2000 Demodulator
    0080  SkyEye Weather Satellite Receiver
+	0090  WeatherFax 2000 Demodulator
 1278  Starlight Xpress
    0105  SXV-M5
    0107  SXV-M7
@@ -15958,6 +16740,7 @@
    2001  88W8388 802.11a/b/g WLAN
    2006  88W8362 802.11n WLAN
    203c  K30326 802.11bgn Wireless Module [Marvell 88W8786U]
+	204c  Bluetooth and Wireless LAN Composite
    8001  BLOB boot loader firmware
 1291  Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc.
    0010  FDM 2xxx Flash-OFDM modem
@@ -15980,6 +16763,10 @@
    1828  Gigaset USB Adapter 300
 12a7  Trendchip Technologies Corp.
 12ab  Honey Bee Electronic International Ltd.
+	0004  Dance Pad for Xbox 360
+	0301  Afterglow Wired Controller for Xbox 360
+	0303  Mortal Kombat Klassic FightStick for Xbox 360
+	8809  Dance Dance Revolution Dance Pad
 12b8  Zhejiang Xinya Electronic Technology Co., Ltd.
 12b9  E28
 12ba  Licensed by Sony Computer Entertainment America
@@ -16010,7 +16797,11 @@
    1037  Ideos
    1038  Ideos (debug mode)
    1039  Ideos (tethering mode)
-	1052  MT7-L09
+	1052  MT7-L09 / P7-L10 / Y330-U01
+	1053  P7-L10 (PTP)
+	1054  P7-L10 (PTP + debug)
+	1079  GEM-703LT [Honor/MediaPad X2]
+	107e  P10 smartphone
    1404  EM770W miniPCI WCDMA Modem
    1406  E1750
    140b  EC1260 Wireless Data Modem HSD USB Card
@@ -16026,7 +16817,7 @@
    14cf  K3772
    14d1  K3770 3G Modem (Mass Storage Mode)
    14db  E353/E3131
-	14dc  E33372 LTE/UMTS/GSM HiLink Modem/Networkcard
+	14dc  E3372 LTE/UMTS/GSM HiLink Modem/Networkcard
    14f1  Gobi 3000 HSPA+ Modem
    14fe  Modem (Mass Storage Mode)
    1501  Pulse
@@ -16036,6 +16827,7 @@
    1520  K3765 HSPA
    1521  K4505 HSPA+
    155a  R205 Mobile WiFi (CD-ROM mode)
+	1573  ME909u-521 mPCIe LTE/GPS card
    1575  K5150 LTE modem
    15bb  ME936 LTE/HSDPA+ 4G modem
    15c1  ME906s LTE M.2 Module
@@ -16047,8 +16839,11 @@
    1d50  ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
    1f01  E353/E3131 (Mass storage mode)
    1f16  K5150 LTE modem (Mass Storage Mode)
+	360e  Y330-U01 (MTP Mode)
    380b  WiMAX USB modem(s)
 12d2  LINE TECH INDUSTRIAL CO., LTD.
+12d3  LINAK
+	0002  DeskLine CBD Control Box
 12d6  EMS Dr. Thomas Wuensche
    0444  CPC-USB/ARM7
    0888  CPC-USB/M16C
@@ -16069,6 +16864,7 @@
    1001  AWU2000b 802.11b Stick
 12ff  Fascinating Electronics, Inc.
    0101  Advanced RC Servo Controller
+1306  FM20 Barcode Scanner
 1307  Transcend Information, Inc.
    0163  256MB/512MB/1GB Flash Drive
    0165  2GB/4GB/8GB Flash Drive
@@ -16092,23 +16888,57 @@
    0111  SP1 Spectrometer (VISA)
    0112  SP2 Spectrometer (VISA)
    8001  TXP-Series Slot (TXP5001, TXP5004)
+	8011  BP1 Slit Beam Profiler
    8012  BC106 Camera Beam Profiler
    8013  WFS10 Wavefront Sensor
+	8016  DMP40 Deformable Mirror
    8017  BC206 Camera Beam Profiler
    8019  BP2 Multi Slit Beam Profiler
    8020  PM300 Optical Power Meter
    8021  PM300E Optical Power and Energy Meter
    8022  PM320E Optical Power and Energy Meter
+	8025  WFS20 Wavefront Sensor
    8030  ER100 Extinction Ratio Meter
+	8039  PAX1000 Rotating Waveplate Polarimeter
+	8047  CLD1000
+	8048  TED4000
+	8049  LDC4000
+	804a  ITC4000
+	8058  LC-100
+	8060  DC3100
+	8061  DC4100
+	8062  DC2100
+	8065  CS2010
+	8066  DC4104
    8070  PM100D
    8072  PM100USB Power and Energy Meter Interface
+	8073  PM106 Wireless Powermeter Photodiode Sensor
+	8074  PM160T Wireless Powermeter Thermal Sensor
+	8075  PM400 Handheld Optical Power/Energy Meter
+	8076  PM101 Serial PD Power Meter
    8078  PM100D Compact Power and Energy Meter Console
    8080  CCS100 - Compact Spectrometer
+	8081  CCS100 Compact Spectrometer
+	8083  CCS125 Spectrometer
+	8085  CCS150 UV Spectrometer
+	8087  CCS175 NIR Spectrometer
+	8089  CCS200 Wide Range Spectrometer
+	8090  SPCM Single Photon Counter
+	80a0  LC100 series smart line camera
+	80b0  PM200 Handheld Power and Energy Meter
+	80c0  DC2200
+	80c9  MTD Series
+	80f0  TSP01
+	80f1  M2SET Dongle
+	8180  OCT Probe Controller (OCTH-1300)
+	8181  OCT Device
 131d  Natural Point
    0155  TrackIR 3 Pro Head Tracker
    0156  TrackIR 4 Pro Head Tracker
    0158  TrackIR 5 Pro Head Tracker
 1325  ams AG
+	00d6  I2C/SPI InterfaceBoard
+	0c08  Embedded Linux Sensor Bridge
    4002  I2C Dongle
 132a  Envara Inc.
    1502  WiND 802.11abg / 802.11bg WLAN
@@ -16156,9 +16986,11 @@
    0003  CX / DNP DS40
    0004  CX-W / DNP DS80 / Mitsubishi CP3800
    0005  CY / DNP DSRX1
-	0006  CW-02
+	0006  CW-02 / OP900ii
    0007  DNP DS80DX
-	0008  CX2 / DNP DS620
+	0008  DNP DS620 (old)
+	000a  CX-02
+	000b  CX-02W
 1345  Sino Lite Technology Corp.
    001c  Xbox Controller Hub
    6006  Defender Wireless Controller
@@ -16189,6 +17021,14 @@
    0089  OpenSDA - CDC Serial Port
    0503  USB-ML-12 HCS08/HCS12 Multilink
    0504  DEMOJM
+	1000  Smart Control Touchpad
+135e  Insta GmbH
+	0021  Berker KNX Data Interface
+	0022  Gira KNX Data Interface
+	0023  JUNG KNX Data Interface
+	0024  Merten/Schneider Electric KNX Data Interface
+	0025  Hager KNX Data Interface
+	0026  Feller KNX Data Interface
 135f  Control Development Inc.
    0110  Linear Spectrograph
    0111  Spectrograph - Renumerated
@@ -16197,6 +17037,7 @@
    0240  MPP Spectrograph
 1366  SEGGER
    0101  J-Link PLUS
+	1015  J-Link
 136b  STEC
 136e  Andor Technology Ltd.
    0012  iXon Ultra CCD
@@ -16218,6 +17059,10 @@
    4000  HDVD800
 137b  SCAPS GmbH
    0002  SCAPS USC-2 Scanner Controller
+137c  YASKAWA ELECTRIC CORP.
+	0220  MP Series
+	0250  SIGMA Series
+	0401  AC Drive
 1385  Netgear, Inc
    4250  WG111T
    4251  WG111T (no firmware)
@@ -16244,7 +17089,7 @@
 138e  Jungo LTD
    9000  Raisonance S.A. STM32 ARM evaluation board / RLink dongle
 1390  TOMTOM B.V.
-	0001  GO 520 T/GO 630/ONE XL (v9)
+	0001  GO 520 T / GO 630 / ONE / ONE XL
    5454  Blue & Me 2
    7474  GPS Sport Watch [Runner, Multi-Sport]
    a001  Bandit Action Camera Batt-Stick
@@ -16252,9 +17097,51 @@
    1000  URTC-1000
 1395  Sennheiser Communications
    0025  Headset [PC 8]
+	0026  SC230
+	0027  SC260
+	0028  SC230 CTRL
+	0029  SC260 CTRL
+	002a  SC230 for Lync
+	002b  SC260 for Lync
+	002d  BTD-800
+	002e  Presence
+	0030  CEHS-CI 02
+	0031  U320 Gaming
+	0032  SC30 for Lync
+	0033  SC60 for Lync
+	0034  SC30 Control
+	0035  SC60 Control
+	0036  SC630 for Lync
+	0037  SC660 for Lync
+	0038  SC630 CTRL
+	0039  SC660 CTRL
+	003f  SP 20
+	0040  MB Pro 1/2
+	0041  SP 20 for Lync
+	0042  SP 10
+	0043  SP 10 for Lync
    0046  PXC 550
+	004a  MOMENTUM M2 OEBT
+	004b  MOMENTUM M2 AEBT
+	004f  SC230 for MS II
+	0050  SC260 for MS II
+	0051  USB-ED CC 01
+	0058  USB-ED CC 01 for MS
+	0059  SC40 for MS
+	005a  SC70 for MS
+	005b  SC40 CTRL
+	005c  SC70 CTRL
+	0060  SCx5 MS
+	0061  SCx5 CTRL
+	0064  MB 660 MS
+	0065  MB 660
+	0066  SP 20 D UC
+	0067  SP 20 D MS
+	006b  SC5x5 MS
+	0072  Headset
    3556  USB Headset
 1397  BEHRINGER International GmbH
+	0004  FCA1616
    00bc  BCF2000
 1398  Q-tec
    2103  USB 2.0 Storage Device
@@ -16356,6 +17243,7 @@
    3392  Azurewave 43228+20702
    3394  Bluetooth
    3474  Atheros AR3012 Bluetooth
+	3526  Bluetooth Radio
    5070  Webcam
    5111  Integrated Webcam
    5115  Integrated Webcam
@@ -16364,11 +17252,16 @@
    5126  PC Cam
    5130  Integrated Webcam
    5134  Integrated Webcam
+	5615  Lenovo EasyCamera
+	5670  HP TrueVision HD
+	5682  SunplusIT Integrated Camera
    5702  UVC VGA Webcam
    5710  UVC VGA Webcam
    5716  UVC VGA Webcam
+	5a07  VGA UVC WebCam
    7020  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
    7022  DTV-DVB UDST7022BDA DVB-S Box(Without HID)
+	784b  XHC Camera
 13d7  Guidance Software, Inc.
    0001  T5 PATA forensic bridge
    000c  T8-R2 forensic bridge
@@ -16387,6 +17280,7 @@
    0001  Optical Mouse
    0003  Optical Mouse
 13fd  Initio Corporation
+	0550  INIC-1530 PATA Bridge
    0840  INIC-1618L SATA
    0841  Samsung SE-T084M DVD-RW
    0940  ASUS SBW-06D2X-U
@@ -16398,7 +17292,9 @@
    1840  INIC-1608 SATA bridge
    1e40  INIC-1610P SATA bridge
    2040  Samsung Writemaster external DVD writer
+	3920  INIC-3619PN SATA Bridge
    3940  external DVD burner ECD819-SU3
+	3960  INIC-3639
    3e40  ZALMAN ZM-VE350
 13fe  Kingston Technology Company Inc.
    1a00  512MB/1GB Flash Drive
@@ -16411,21 +17307,29 @@
    2240  microSD card reader
    3100  2/4 GB stick
    3123  Verbatim STORE N GO 4GB
+	3200  flash drive (2GB, EMTEC)
    3600  flash drive (4GB, EMTEC)
    3800  Rage XT Flash Drive
+	3d00  Flash Drive
    3e00  Flash Drive
    4100  Flash drive
+	4200  Platinum USB drive mini
    5000  USB flash drive (32 GB SHARKOON Accelerate)
    5100  Flash Drive
    5200  DataTraveler R3.0
+	5500  Flash drive
+	6300  SP Mobile C31 (64GB)
 1400  Axxion Group Corp.
 1402  Bowe Bell & Howell
 1403  Sitronix
    0001  Digital Photo Frame
    0003  Digital Photo Frame (DPF-1104)
+1404  Fundamental Software, Inc.
+	cddc  Dongle
 1409  IDS Imaging Development Systems GmbH
    1000  generic (firmware not loaded yet)
    1485  uEye UI1485
+	3240  uEye UI3240
 140e  Telechips, Inc.
    b011  TCC780X-based player (USB Boot mode)
    b021  TCC77X-based players (USB Boot mode)
@@ -16487,7 +17391,10 @@
 1430  RedOctane
    0150  wireless receiver for skylanders wii
    4734  Guitar Hero4 hub
+	4748  Guitar Hero X-plorer
    474b  Guitar Hero MIDI interface
+	8888  TX6500+ Dance Pad
+	f801  Controller
 1431  Pertech Resources, Inc.
 1435  Wistron NeWeb
    0427  UR054g 802.11g Wireless Adapter [Intersil ISL3887]
@@ -16518,6 +17425,7 @@
    0408  dedicated haptic device
 1452  Dai Nippon Printing, Inc
    8b01  DS620
+	9001  DS820
 1453  Radio Shack
    4026  26-183 Serial Cable
 1456  Extending Wire & Cable Co., Ltd.
@@ -16543,12 +17451,19 @@
    0161  15901 802.11bg Wireless Adapter [Realtek RTL8187L]
    0167  Widescreen 3MP Webcam
    0176  Isla Keyboard
+	019f  17676 Webcam
+	01e5  Keyboard [GXT 830]
+	0212  Panora Widescreen Graphic Tablet
+	023f  Mouse [GXT 168]
 1460  Tatung Co.
    9150  eHome Infrared Transceiver
 1461  Staccato Communications
 1462  Micro Star International
    5512  MegaStick-1 Flash Stick
    8807  DIGIVOX mini III [af9015]
+146b  BigBen Interactive
+	0601  Controller for Xbox 360
+	0902  Wired Mini PS3 Game Controller
 1472  Huawei-3Com
    0007  Aolynk WUB300g [ZyDAS ZD1211]
    0009  Aolynk WUB320g
@@ -16619,6 +17534,7 @@
 1498  Microtek International Inc.
    a090  DVB-T Tuner
 149a  Imagination Technologies
+	069b  PURE Digital Evoke-1XT Tri-band
    2107  DBX1 DSP core
 14aa  WideView Technology Inc.
    0001  Avermedia AverTV DVBT USB1.1 (cold)
@@ -16631,6 +17547,7 @@
 14ae  Printronix Inc.
 14af  ATP Electronics Inc.
 14b0  StarTech.com Ltd.
+	3410  Serial Adapter ICUSB2321X [TUSB3410I]
 14b2  Ralink Technology, Corp.
    3a93  Topcom 802.11bg Wireless Adapter [Atheros AR5523]
    3a95  Toshiba WUS-G06G-JT 802.11bg Wireless Adapter [Atheros AR5523]
@@ -16661,6 +17578,7 @@
    123a  SD/MMC/RS-MMC Card Reader
    125c  SD card reader
    127b  SDXC Reader
+	168a  Elecom Co., Ltd MR-K013 Multicard Reader
    6116  M6116 SATA Bridge
    6600  M110E PATA bridge
    6700  Card Reader
@@ -16682,7 +17600,16 @@
    ab11  GU-1000T
    ab13  GW-US54Mini 802.11bg
 14ed  Shure Inc.
+	1000  MV5
+	1002  MV51
+	1003  MVi
+	1004  SHA900
+	1005  KSE1500
+	1011  MV88+
+	1100  ANIUSB-MATRIX
+	1101  P300
    29b6  X2u Adapter
+	3000  RMCE-USB
 14f7  TechniSat Digital GmbH
    0001  SkyStar 2 HD CI
    0002  SkyStar 2 HD CI
@@ -16691,6 +17618,9 @@
    0500  DVB-PC TV Star HD
 1500  Ellisys
 1501  Pine-Tum Enterprise Co., Ltd.
+1504  Bixolon CO LTD
+	001f  SRP-350II Thermal Receipt Printer
+1508  Fibocom
 1509  First International Computer, Inc.
    0a01  LI-3100 Area Meter
    0a02  LI-7000 CO2/H2O Gas Analyzer
@@ -16778,10 +17708,14 @@
    0539  JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge
    0551  JMS551 SuperSpeed two ports SATA 3Gb/s bridge
    0561  JMS551 - Sharkoon SATA QuickPort Duo
+	0562  JMS567 SATA 6Gb/s bridge
    0567  JMS567 SATA 6Gb/s bridge
-	0578  JMS567 SATA 6Gb/s bridge
+	0576  Gen1 SATA 6Gb/s Bridge
+	0578  JMS578 SATA 6Gb/s
+	0583  JMS583Gen 2 to PCIe Gen3x2 Bridge
    0770  Alienware Integrated Webcam
    1561  JMS561U two ports SATA 6Gb/s bridge
+	1576  External Disk 3.0
    2329  JM20329 SATA Bridge
    2335  ATA/ATAPI Bridge
    2336  Hard Disk Drive
@@ -16796,46 +17730,230 @@
    2590  JMS567 SATA 6Gb/s bridge
    3562  JMS567 SATA 6Gb/s bridge
    3569  JMS566 SATA 3Gb/s bridge
+	578e  JMS578 SATA 6Gb/s bridge
+	8561  salcar docking station two disks
 152e  LG (HLDS)
+	1640  INIC-1605 SATA Bridge
    2507  PL-2507 IDE Controller
+	2571  GP08NU6W DVD-RW
    e001  GSA-5120D DVD-RW
 1532  Razer USA, Ltd
    0001  RZ01-020300 Optical Mouse [Diamondback]
+	0002  Diamondback Optical Mouse
    0003  Krait Mouse
+	0005  Boomslang CE
    0007  DeathAdder Mouse
-	0013  Orochi mouse
+	0009  Gaming Mouse [Tempest Habu]
+	000a  Mamba (Wired)
+	000c  Lachesis
+	000d  DiamondBack 3G
+	000e  Megalodon
+	000f  Mamba (Wireless)
+	0012  Gaming Mouse [Salmosa]
+	0013  Orochi 2011
    0015  Naga Mouse
-	0016  DeathAdder Mouse
+	0016  DeathAdder 3.5G
    0017  RZ01-0035 Laser Gaming Mouse [Imperator]
+	0019  Marauder
+	001a  Spectre
+	001b  Gaming Headset
    001c  RZ01-0036 Optical Gaming Mouse [Abyssus]
-	0024  Mamba
-	002e  RZ01-0058 Gaming Mouse [Naga]
+	001e  Lachesis (5600 DPI)
+	001f  Naga Epic (Wired)
+	0020  Abyssus 1800
+	0021  Naga Epic Dock (Wireless, Bluetooth)
+	0022  Gaming Mouse [TRON]
+	0023  Gaming Keyboard [TRON]
+	0024  Mamba 2012 (Wired)
+	0025  Mamba 2012 (Wireless)
+	0029  DeathAdder Black Edition
+	002a  Gaming Mouse [Star Wars: The Old Republic]
+	002b  Gaming Keyboard [Star Wars: The Old Republic]
+	002c  Gaming Headset [Star Wars: The Old Republic]
+	002e  RZ01-0058 Gaming Mouse [Naga 2012]
    002f  Imperator 2012
-	0036  RZ01-0075, Gaming Mouse [Naga Hex]
+	0031  Gaming Mouse Dock [Star Wars: The Old Republic]
+	0032  Ouroboros 2012 (Wired)
+	0033  Ouroboros 2012 (Wireless)
+	0034  Taipan
+	0035  Krait 2013 Essential
+	0036  RZ01-0075, Gaming Mouse [Naga Hex (Red)]
+	0037  DeathAdder 2013
+	0038  DeathAdder 1800
+	0039  Orochi 2013
+	003e  Naga Epic Chroma (Wired)
+	003f  Naga Epic Chroma (Wireless)
+	0040  Naga 2014
+	0041  Naga Hex
    0042  Abyssus 2014
    0043  DeathAdder Chroma
    0044  Mamba Chroma (Wired)
    0045  Mamba Chroma (Wireless)
    0046  Mamba 2015 Tournament Edition [RZ01-01370100-R3]
-	0048  Orochi (Wired)
+	0048  Orochi 2015 (Wired)
+	004a  RZ03-0133 Gaming Lapboard, Keyboard Mouse Combo, Dongle [Turret Dongle]
+	004c  Diamondback Chroma
+	004d  DeathAdder 2000 (Cynosa Pro Bundle)
+	004f  RZ01-0145, Gaming Mouse [DeathAdder 2000 (Alternate)]
+	0050  Naga Hex V2
+	0053  Naga Chroma
+	0054  DeathAdder 3500
+	0056  Orochi 2015 (Wireless)
+	0059  RZ01-0212 Gaming Mouse [Lancehead (Wired)]
+	005a  RZ01-0212 Gaming Mouse [Lancehead (Wireless)]
+	005b  Abyssus V2
+	005c  DeathAdder Elite
+	005e  Abyssus 2000
+	005f  DeathAdder 2000
+	0060  RZ01-0213 Gaming Mouse [Lancehead Tournament Edition]
+	0062  Atheris
+	0064  Basilisk
+	0065  RZ01-0265, Gaming Mouse [Basilisk Essential]
+	0067  Naga Trinity
+	0068  Gaming Mouse Mat [Firefly Hyperflux]
+	0069  Gaming Mouse [Mamba Hyperflux]
+	006a  Abyssus Elite (D.Va Edition)
+	006b  Abyssus Essential
+	006c  Mamba Elite (Wired)
+	006e  DeathAdder Essential
+	006f  RZ01-0257 Gaming Mouse [Lancehead Wireless (2019, Wireless, Receiver)]
+	0070  RZ01-0257 Gaming Mouse [Lancehead Wireless (2019, Wired)]
+	0071  RZ01-0254 Gaming Mouse [DeathAdder Essential White Edition]
+	0072  Mamba 2018 (Wireless)
+	0073  Mamba 2018 (Wired)
+	0078  Viper (wired)
+	007a  RC30-0305 Gaming Mouse [Viper Ultimate (Wired)]
+	007b  RC30-0305 Gaming Mouse Dongle [Viper Ultimate (Wireless)]
+	007e  RC30-030502 Mouse Dock
+	0083  RC30-0315, Gaming Mouse [Basilisk X HyperSpeed]
+	0084  RZ01-0321 Gaming Mouse [DeathAdder V2]
+	0085  RZ01-0316 Gaming Mouse [Basilisk V2]
+	0086  Gaming Mouse [Basilisk Ultimate, Wired]
+	0088  Gaming Mouse [Basilisk Ultimate, Wireless, Receiver]
+	008a  RZ01-0325, Gaming Mouse [Viper Mini]
    0101  Copperhead Mouse
    0102  Tarantula Keyboard
+	0103  Gaming Keyboard [Reclusa]
+	0105  Gaming Keyboard [ProType]
+	0106  Gaming Keyboard [ProType]
    0109  Lycosa Keyboard
+	010b  Gaming Keyboard [Arctosa]
    010d  BlackWidow Ultimate 2012
+	010e  BlackWidow Classic (Alternate)
+	010f  Anansi
+	0110  Cyclosa
+	0111  Nostromo
    0113  RZ07-0074 Gaming Keypad [Orbweaver]
-	0118  RZ03-0080, Gaming Keyboard [Deathstalker]
+	0114  DeathStalker Ultimate
+	0116  Blade Pro (2015)
+	0118  RZ03-0080, Gaming Keyboard [Deathstalker Essential]
+	0119  Gaming Keyboard [Lycosa]
    011a  BlackWidow Ultimate 2013
    011b  BlackWidow Classic
+	011c  BlackWidow Tournament Edition Stealth
+	011d  Blade 2013
+	011e  Gaming Keyboard Dock [Edge Keyboard Dock]
+	011f  Deathstalker Essential 2014
+	0200  Gaming Keyboard [Reclusa]
+	0201  Tartarus
+	0202  DeathStalker Expert
    0203  BlackWidow Chroma
+	0204  DeathStalker Chroma
    0205  Blade Stealth
-	0208  Tartarus
+	0207  Orbweaver Chroma keypad
+	0208  Tartarus Chroma
    0209  BlackWidow Tournament Edition Chroma
+	020d  Cynosa Pro keyboard (Cynosa Pro Bundle)
+	020f  Blade QHD
+	0210  Blade Pro (Late 2016)
+	0211  BlackWidow Chroma (Overwatch)
    0214  BlackWidow Ultimate 2016
+	0215  Core
    0216  BlackWidow X Chroma
+	0217  BlackWidow X Ultimate
    021a  BlackWidow X Tournament Edition Chroma
+	021b  Gaming Keyboard [BlackWidow X Tournament Edition]
+	021e  Ornata Chroma
+	021f  Ornata
    0220  Blade Stealth (2016)
+	0221  RZ03-0203 Gaming Keyboard [BlackWidow Chroma V2]
+	0224  Blade (Late 2016)
+	0225  Blade Pro (2017)
+	0226  Huntsman Elite
+	0227  Huntsman
+	0228  BlackWidow Elite
+	022a  Cynosa Chroma
+	022b  Tartarus V2
+	022c  Cynosa Chroma Pro
+	022d  Blade Stealth (Mid 2017)
+	022f  Blade Pro FullHD (2017)
+	0232  Blade Stealth (Late 2017)
+	0233  Blade 15 (2018)
+	0234  Blade Pro 17 (2019)
+	0235  BlackWidow Lite (2018)
+	0237  BlackWidow Essential
+	0239  Blade Stealth (2019)
+	023a  Blade 15 (2019) Advanced
+	023b  Blade 15 (2018) Base Model
+	023f  RZ03-0274 Gaming Keyboard [Cynosa Lite]
+	0240  Blade 15 (2018) Mercury
+	0241  BlackWidow (2019)
+	0243  Huntsman Tournament Edition
+	0244  RZ07-0311 Gaming Keypad [Tartarus Pro]
+	0245  Blade 15 (Mid 2019) Mercury
+	0246  Blade 15 (Mid 2019) Base Model
+	024a  Blade Stealth (Late 2019)
+	024b  Gaming Laptop [Blade 15 Advanced (Late 2019)]
+	024c  Gaming Laptop [Blade Pro (Late 2019)]
+	024d  Blade 15 Studio Edition (2019)
+	0253  RZ09-0330, Gaming Laptop [Blade 15 Advanced (Early 2020)]
+	0255  RZ09-0328, Gaming Laptop [Blade 15 Base Model (2020)]
+	0256  RZ09--0329, Gaming Laptop [Blade Pro 17 Full HD (2020)]
+	025d  RZ03-0338, Gaming Keyboard [Ornata V2]
    0300  RZ06-0063 Motion Sensing Controllers [Hydra]
-	0c00  Firefly
+	0401  Gaming Arcade Stick [Panthera]
+	0501  Kraken 7.1
+	0502  Gaming Headset [Kraken USB]
+	0504  Kraken 7.1 Chroma
+	0506  Kraken 7.1 (Alternate Version)
+	0510  Kraken 7.1 V2
+	0511  RZ19-0229 Gaming Microphone
+	0514  Electra V2 USB
+	0517  Nommo Chroma
+	0518  Nommo Pro
+	051a  Nari Ultimate
+	051c  Nari (Wireless)
+	051d  Nari (Wired)
+	051e  RC30-026902, Gaming Headset [Nari Essential, Wireless, Receiver]
+	051f  RC30-026901, Gaming Headset [Nari Essential, Wired]
+	0520  Kraken Tournament Edition
+	0521  Kraken Kitty Edition
+	0527  RZ04-0318 Gaming Headset [Kraken Ultimate]
+	0904  R201-0282 Gaming Keyboard, Mouse Combination [Turret For Xbox One]
+	0a00  Atrox Arcade Stick for Xbox One
+	0a02  ManO'War
+	0a03  Wildcat
+	0a15  RZ06-0199, Gaming Controller [Wolverine Tournament Edition]
+	0c00  RZ02-0135 Hard Gaming Mouse Mat [Firefly]
+	0c01  Goliathus
+	0c02  Goliathus Extended
+	0c04  Firefly V2
+	0e03  Gaming Webcam [Kiyo]
+	0f03  Tiamat 7.1 V2
+	0f07  Chroma Mug Holder
+	0f08  Base Station Chroma
+	0f09  Chroma HDK
+	0f0d  Laptop Stand Chroma
+	0f13  Lian Li O11 Dynamic Razer Edition
+	0f1a  Core X Chroma
+	1000  Gaming Controller [Raiju]
+	1004  Gaming Controller [Raiju Ultimate Wired]
+	1007  Gaming Controller [Raiju 2 Tournament Edition (USB)]
+	1008  Gaming Flightstick [Panthera Evo]
+	1009  Gaming Controller [Raiju 2 Ultimate Edition (BT)]
+	100a  Gaming Controller [Raiju 2 Tournament Edition (BT)]
+	110d  Bootloader (Alternate)
+	800e  Bootloader
 153b  TerraTec Electronic GmbH
    1181  Cinergy S2 PCIe Dual Port 1
    1182  Cinergy S2 PCIe Dual Port 2
@@ -16851,6 +17969,7 @@
 154a  Celectronic GmbH
    8180  CARD STAR/medic2
 154b  PNY
+	000f  Flash Drive
    0010  USB 2.0 Flash Drive
    0048  Flash Drive
    004d  8 GB Flash Drive
@@ -16859,6 +17978,8 @@
    005b  Flash Drive
    0062  Flash Drive
    007a  Classic Attache Flash Drive
+	5408  2.5in drive enclosure
+	6000  Flash Drive
    6545  FD Device
    fa05  Flash Drive
 154d  ConnectCounty Holdings Berhad
@@ -16902,11 +18023,16 @@
 15a2  Freescale Semiconductor, Inc.
    0038  9S08JS Bootloader
    003b  USB2CAN Application for ColdFire DEMOJM board
+	0041  i.MX51 SystemOnChip in RecoveryMode
    0042  OSBDM - Debug Port
+	004e  i.MX53 SystemOnChip in RecoveryMode
    004f  i.MX28 SystemOnChip in RecoveryMode
    0052  i.MX50 SystemOnChip in RecoveryMode
    0054  i.MX 6Dual/6Quad SystemOnChip in RecoveryMode
    0061  i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode
+	006a  Vybrid series SystemOnChip in RecoveryMode
+	0076  i.MX 7Solo/7Dual SystemOnChip in RecoveryMode
+	0080  i.MX 6ULL SystemOnChip in RecoveryMode
 15a4  Afatech Technologies, Inc.
    1000  AF9015/AF9035 DVB-T stick
    1001  AF9015/AF9035 DVB-T stick
@@ -16928,6 +18054,7 @@
    0004  OpenOCD JTAG TINY
    002a  ARM-USB-TINY-H JTAG interface
    002b  ARM-USB-OCD-H JTAG+RS232
+	003c  TERES Keyboard+Touchpad
 15c0  XL Imaging
    0001  2M pixel Microscope Camera
    0002  3M pixel Microscope Camera
@@ -16973,6 +18100,7 @@
    0a41  MI-2540D [Optical mouse]
    0a4c  USB+PS/2 Optical Mouse
    0a4d  Optical Mouse
+	0a4e  AM-5400 [Optical Mouse]
    0a4f  Optical Mouse
 15dc  Hynix Semiconductor Inc.
 15e0  Seong Ji Industrial Co., Ltd.
@@ -16980,7 +18108,11 @@
    2007  RSA SecurID (R) Authenticator
 15e4  Numark
    0024  Mixtrack
+	003c  DJ2GO2 Touch
    0140  ION VCR 2 PC / Video 2 PC
+	3f00  Power A Mini Pro Elite
+	3f0a  Airflo Wired Controller for Xbox 360
+	3f10  Batarang controller for Xbox 360
 15e8  SohoWare
    9100  NUB100 Ethernet [pegasus]
    9110  10/100 USB Ethernet
@@ -16992,8 +18124,10 @@
 15f4  HanfTek
    0001  HanfTek UMT-010 USB2.0 DVB-T (cold)
    0025  HanfTek UMT-010 USB2.0 DVB-T (warm)
+	0131  Astrometa DVB-T/T2/C FM & DAB receiver [RTL2832P]
    0135  Astrometa T2hybrid
 1604  Tascam
+	10c0  Dell Integrated Hub
    8000  US-428 Audio/Midi Controller (without fw)
    8001  US-428 Audio/Midi Controller
    8004  US-224 Audio/Midi Controller (without fw)
@@ -17002,6 +18136,11 @@
    8007  US-122 Audio/Midi Interface
 1605  ACCES I/O Products, Inc.
    0001  DIO-32 (No Firmware Yet)
+	0002  USB-DIO-48 (No Firmware Yet)
+	0003  USB-DIO-96 (No Firmware Yet)
+	0004  USB-DIO-32I (No Firmware Yet)
+	0005  USB-DIO24 (based on -CTR6) (No Firmware Yet)
+	0006  USB-DIO24-CTR6 (No Firmware Yet)
 1606  Umax
    0002  Astra 1236U Scanner
    0010  Astra 1220U
@@ -17120,6 +18259,10 @@
 1631  Good Way Technology
    6200  GWUSB2E
    c019  RT2573
+1633  AIM GmbH
+	4510  ASC1553
+	4520  ASC429
+	4560  ASC-FDX
 1645  Entrega [hex]
    0001  1S Serial Port
    0002  2S Serial Port
@@ -17197,6 +18340,8 @@
 1679  Total Phase
    2001  Beagle Protocol Analyzer
    2002  Cheetah SPI Host Adapter
+167b  Pure Digital Technologies, Inc.
+	2009  Flip Ultra U1120
 1680  Golden Bridge Electech Inc.
    a332  DVB-T Dongle [RTL2832U]
 1681  Prevo Technologies, Inc.
@@ -17210,7 +18355,10 @@
 1685  Delock
    0200  Infrared adapter
 1686  ZOOM Corporation
-	0045  H4 Digital Recorder
+	0045  Handy Recorder stereo mix
+	01c0  Zoom Handy Recorder card reader
+	01c5  Zoom Handy Recorder multi track
+	03d5  LiveTrak L-12
 1687  Kingmax Digital Inc.
    5289  FlashDisk
    6211  FlashDisk
@@ -17218,6 +18366,8 @@
 1688  Saab AB
 1689  Razer USA, Ltd
    fd00  Onza Tournament Edition controller
+	fd01  Onza Classic Edition
+	fe00  Sabertooth Elite
 168c  Atheros Communications
    0001  AR5523
    0002  AR5523 (no firmware)
@@ -17300,8 +18450,10 @@
    0486  Teensyduino RawHID
    0487  Teensyduino Serial+Keyboard+Mouse+Joystick
    0488  Teensyduino Flight Sim Controls
+	05b5  BU0836
    05dc  shared ID for use with libusb
    05dd  BlackcatUSB2
+	05de  Flashcat
    05df  HID device except mice, keyboards, and joysticks
    05e1  Free shared USB VID/PID pair for CDC devices
    05e4  Free shared USB VID/PID pair for MIDI devices
@@ -17317,6 +18469,7 @@
    08cb  Alpermann+Velte Studio Clock
    08cc  Alpermann+Velte SAM7S MT Boot Loader
    08cd  Alpermann+Velte SAM7X MT Boot Loader
+	09ce  LINKUSB
    0a32  jbmedia Light-Manager Pro
    27d8  libusb-bound devices
    27d9  HID device except mice, keyboards, and joysticks
@@ -17336,15 +18489,34 @@
    0504  RETRO Innovations ZoomFloppy
    054b  GrauTec ReelBox OLED Display (external)
    05be  EasyLogic Board
+	05f0  Superior Freedom Programmable IR Remote
    06cc  Trinamic TMCM-3110
+	06f0  Axium AX-R4C Controller
+	06f1  Axium AX-R1D Controller
    06f9  Gabotronics Xminilab
+	0726  Autonomic M400 Amplifier
+	0727  Autonomic M800 Amplifier
    0753  Digistump DigiSpark
    075c  AB-1.x UAC1 [Audio Widget]
    075d  AB-1.x UAC2 [Audio Widget]
+	07cc  Xylanta Ltd, Saint3 Device
+	07f8  Axium AX-R4D Controller
    080a  S2E1 Interface
+	0830  DMXControl Projects e.V., Nodle U1
+	0831  DMXControl Projects e.V., Desklamp
+	0832  DMXControl Projects e.V., Nodle U2
+	0833  DMXControl Projects e.V., Nodle R4S
    0870  Kaufmann Automotive GmbH, RKS+CAN Interface
+	09f2  Axium AX-1250 Amplifier
+	09f4  Axium AX-Mini4 Amplifier
    0b03  AIS Receiver [dAISy]
+	0b7d  Autonomic M801 Amplifier
+	0b7e  Autonomic M401 Amplifier
+	0b7f  Autonomic M120e Amplifier
    0bd4  codesrc SCSI2SD
+	0c9b  Fermium LABS srl/LabTrek srl Hall Effect Apparatus
+	0d3c  InputStick BT4.0
+	0e1e  AtomMiner
 16d1  Suprema Inc.
    0401  SUP-SFR400(A) BioMini Fingerprint Reader
 16d3  Frontline Test Equipment, Inc.
@@ -17377,10 +18549,13 @@
    0015  CML Control, Measurement and Data Logging System
 16de  Telemecanique
 16df  King Billion Electronics Co., Ltd.
-16f0  GN ReSound A/S
+16f0  GN Hearing A/S
    0001  Speedlink Programming Interface
    0003  Airlink Wireless Programming Interface
+	0004  Accessory Programming Interface
 16f5  Futurelogic Inc.
+1702  FDI-MATELEC
+	0002  Encodeur
 1706  BlueView Technologies, Inc.
 1707  ARTIMI
 170b  Swissonic
@@ -17411,7 +18586,7 @@
 1733  Cellink Technology Co., Ltd
    0101  RF Wireless Optical Mouse OP-701
 1736  CANON IMAGING SYSTEM TECHNOLOGIES INC.
-1737  Linksys
+1737  802.11g Adapter [Linksys WUSB54GC v3]
    0039  USB1000 Gigabit Notebook Adapter
    0070  WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870]
    0071  WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870]
@@ -17445,18 +18620,23 @@
    0101  Packet-Master USB12
 174c  ASMedia Technology Inc.
    07d1  Transcend ESD400 Portable SSD (USB 3.0)
+	1151  ASM1151W
    1153  ASM1153 SATA 3Gb/s bridge
    2074  ASM1074 High-Speed hub
    3074  ASM1074 SuperSpeed hub
    5106  ASM1051 SATA 3Gb/s bridge
    5136  ASM1053 SATA 3Gb/s bridge
    51d6  ASM1051W SATA 3Gb/s bridge
-	55aa  Name: ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge, ASM1153E SATA 6Gb/s bridge
+	55aa  ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge, ASM1153E SATA 6Gb/s bridge
 174f  Syntek
    1105  SM-MS/Pro-MMC-XD Card Reader
    110b  HP Webcam
+	1122  HP Webcam
+	1169  Lenovo EasyCamera
    1403  Integrated Webcam
    1404  USB Camera device, 1.3 MPixel Web Cam
+	1758  XYZ printing cameraR2
+	1759  XYZ printing cameraL2
    5212  USB 2.0 UVC PC Camera
    5a11  PC Camera
    5a31  Sonix USB 2.0 Camera
@@ -17479,18 +18659,27 @@
 1759  LucidPort Technology, Inc.
 1761  ASUSTek Computer, Inc. (wrong ID)
    0b05  802.11n Network Adapter (wrong ID - swapped vendor and device)
+1770  MSI
+	ff00  steel series rgb keyboard
 1772  System Level Solutions, Inc.
 1776  Arowana
    501c  300K CMOS Camera
+1777  Microscan Systems, Inc.
+	0003  MicroHAWK ID-20
 177f  Sweex
    0004  MM004V5 Photo Key Chain (Digital Photo Frame) 1.5"
    0153  LW153 802.11n Adapter [ralink rt3070]
    0154  LW154 802.11bgn (1x1:1) Wireless Adapter [Realtek RTL8188SU]
    0313  LW313 802.11n Adapter [ralink rt2770 + rt2720]
 1781  Multiple Vendors
+	07df  Axium AX-800DAV Amplifier
+	07e1  Axium AX-KPC Keypad
+	07e2  Axium AX-KPD Keypad
+	07e3  Axium AX-400DA Amplifier
    083e  MetaGeek Wi-Spy
    083f  MetaGeek Wi-Spy 2.4x
    0938  Iguanaworks USB IR Transceiver
+	0941  qNimble Quark
    0a96  raphnet.net usb_game12
    0a97  raphnet.net SNES mouse adapter
    0a98  raphnet.net USBTenki
@@ -17501,13 +18690,16 @@
    0a9d  raphnet.net 4nes4snes
    0a9e  raphnet.net Megadrive multitap
    0a9f  raphnet.net MultiDB9joy
+	0bad  Mantracourt Load Cell
    0c30  Telldus TellStick
    0c31  Telldus TellStick Duo
    0c9f  USBtiny
    1eef  OpenAPC SecuKey
    1ef0  E1701 Modular Controller Card
    1ef1  E1701 Modular Controller Card
+	1ef2  E1803 Compact Controller Card
 1782  Spreadtrum Communications Inc.
+	3d00  F200n mobile phone
 1784  TopSeed Technology Corp.
    0001  eHome Infrared Transceiver
    0004  RF Combo Device
@@ -17518,6 +18710,8 @@
    0011  eHome Infrared Transceiver
 1787  ATI AIB
 1788  ShenZhen Litkconn Technology Co., Ltd.
+178e  ASUSTek Computer, Inc. (wrong ID)
+	0b05  CrossLink cable 2GB (wrong ID - swapped vendor and device)
 1796  Printrex, Inc.
 1797  JALCO CO., LTD.
 1799  Thales Norway A/S
@@ -17531,15 +18725,24 @@
    0100  C03U multi-pattern microphone
    0101  UB1 boundary microphone
    0120  Meteorite condenser microphone
+	0130  Go Mic Direct
+	0132  Go Mic Mobile wireless receiver
    0200  StudioDock monitors (internal hub)
    0201  StudioDock monitors (audio)
    0210  StudioGT monitors
+	0211  StudioGT monitors [CM6400]
+	0240  Go Mic Connect
+	0241  G-Track Pro microphone
    0301  Q2U handheld microphone with XLR
    0302  GoMic compact condenser microphone
    0303  C01U Pro condenser microphone
    0304  Q2U handheld mic with XLR
    0305  GoMic compact condenser mic
    0310  Meteor condenser microphone
+	0311  Satellite condenser microphone
+	1616  RXD1 wireless receiver
+	b241  G-Track Pro firmware update
+	b311  Satellite firmware update
 17a4  Concept2
    0001  Performance Monitor 3
    0002  Performance Monitor 4
@@ -17548,6 +18751,10 @@
 17a8  Kamstrup A/S
    0001  Optical Eye/3-wire
    0005  M-Bus Master MultiPort 250D
+	0010  444MHz Radio Mesh Frontend
+	0011  444MHz RF sniffer
+	0012  870MHz Radio Mesh Frontend
+	0013  870MHz RF sniffer
 17b3  Grey Innovation
    0004  Linux-USB Midi Gadget
 17b5  Lunatone
@@ -17561,10 +18768,13 @@
 17c3  Singim International Corp.
 17cc  Native Instruments
    041c  Audio 2 DJ
+	041d  Traktor Audio 2
    0808  Maschine Controller
    0815  Audio Kontrol 1
    0839  Audio 4 DJ
    0d8d  Guitarrig Mobile
+	1001  Komplete Audio 6
+	1110  Maschine Mikro
    1915  Session I/O
    1940  RigKontrol3
    1969  RigKontrol2
@@ -17579,6 +18789,9 @@
 17d3  Korea Techtron Co., Ltd.
 17e9  DisplayLink
    0051  USB VGA Adaptor
+	0198  DisplayLink
+	019e  Overfly FY-1016A
+	028f  HIS Multi-View II
    030b  HP T100
    0377  Plugable UD-160-A (M)
    0378  Plugable UGA-2K-A
@@ -17589,17 +18802,33 @@
    037d  Plugable USB2-HDMI-165
    410a  HDMI Adapter
    430a  HP Port Replicator (Composite Device)
+	430f  Kensington Dock (Composite Device)
    4312  S2340T
+	436e  Dell D3100 Docking Station
+	ff10  I1659FWUX {AOC Powered Monitor]
 17eb  Cornice, Inc.
 17ef  Lenovo
-	1000  Hub
+	1000  ThinkPad X6 UltraBase
    1003  Integrated Smart Card Reader
    1004  Integrated Webcam
+	1005  ThinkPad X200 Ultrabase (42X4963 )
    1008  Hub
    100a  ThinkPad Mini Dock Plus Series 3
+	100f  ThinkPad Ultra Dock Hub
+	1010  ThinkPad Ultra Dock Hub
+	1020  ThinkPad Dock Hub
+	1021  ThinkPad Dock Hub [Cypress HX2VL]
+	3049  ThinkPad OneLink integrated audio
    304b  AX88179 Gigabit Ethernet [ThinkPad OneLink GigaLAN]
+	304f  RTL8153 Gigabit Ethernet [ThinkPad OneLink Pro Dock]
+	3060  ThinkPad Dock
+	3062  ThinkPad Dock Ethernet [Realtek RTL8153B]
+	3063  ThinkPad Dock Audio
+	3066  ThinkPad Thunderbolt 3 Dock MCU
+	3069  ThinkPad TBT3 LAN
+	306a  ThinkPad Thunderbolt 3 Dock Audio
    3815  ChipsBnk 2GB USB Stick
-	4802  Lenovo Vc0323+MI1310_SOC Camera
+	4802  Vc0323+MI1310_SOC Camera
    4807  UVC Camera
    480c  Integrated Webcam
    480d  Integrated Webcam [R5U877]
@@ -17617,9 +18846,22 @@
    6004  ISD-V4 Tablet Pen
    6007  Smartcard Keyboard
    6009  ThinkPad Keyboard with TrackPoint
+	600e  Optical Mouse
    6014  Mini Wireless Keyboard N5901
+	6019  M-U0025-O Mouse
+	6022  Ultraslim Plus Wireless Keyboard and Mouse
    6025  ThinkPad Travel Mouse
+	602d  Black Silk Keyboard
+	6032  Wireless Dongle for Keyboard and Mouse
+	6044  ThinkPad Laser Mouse
+	6047  ThinkPad Compact Keyboard with TrackPoint
+	604b  Precision Wireless Mouse
+	608d  Optical Mouse
+	609b  Professional Wireless Keyboard and Mouse Combo
+	609c  Professional Wireless Keyboard
    7203  Ethernet adapter [U2L 100P-Y1]
+	7205  Thinkpad LAN
+	7217  VGA adapter
    7423  IdeaPad A1 Tablet
    7435  A789 (Mass Storage mode, with debug)
    743a  A789 (Mass Storage mode)
@@ -17627,11 +18869,33 @@
    7498  A789 (MTP mode, with debug)
    749a  A789 (PTP mode)
    749b  A789 (PTP mode, with debug)
+	7604  A760 (Mass Storage mode)
+	7605  A760 (Mass Storage mode, with debug)
+	760a  A760 (MTP mode)
+	760b  A760 (MTP mode, with debug)
+	760c  A760 (PTP mode)
+	760d  A760 (PTP mode, with debug)
+	76fc  B8000-H (Yoga Tablet 10) (mass storage)
+	76fd  B8000-H (Yoga Tablet 10) (debug , mass storage)
+	76fe  B8000-H (Yoga Tablet 10) (MTP)
+	76ff  B8000-H (Yoga Tablet 10) (debug , MTP)
+	7702  B8000-H (Yoga Tablet 10) (PTP)
+	7703  B8000-H (Yoga Tablet 10) (debug , PTP)
+	7704  B8000-H (Yoga Tablet 10) (USB tether)
+	7705  B8000-H (Yoga Tablet 10) (debug , USB tether)
+	7706  B8000-H (Yoga Tablet 10) (zerocd)
+	7707  B8000-H (Yoga Tablet 10) (debug , zerocd)
+	785f  TAB 2 A7-10 Tablet
+	b000  Virtual Keyboard and Mouse
+	b001  Ethernet
+	b003  Virtual Keyboard and Mouse / Mass Storage
+	f003  MEDION LIFETAB X10605 MTP mode
 17f4  WaveSense
    aaaa  Jazz Blood Glucose Meter
 17f5  K.K. Rocky
-17f6  Unicomp, Inc
+17f6  Unicomp, Inc.
    0709  Model M Keyboard
+	0822  Ruffian 6 Keyboard v3 [Model M]
 1809  Advantech
    4604  USB-4604
    4761  USB-4761 Portable Data Acquisition Module
@@ -17644,7 +18908,11 @@
    0010  VoiceKey
 1843  Vaisala
 1849  ASRock Incorporation
+184f  K2L GmbH
+	0012  MOCCA compact
 1852  GYROCOM C&C Co., LTD
+	7022  Fiio E10
+	7921  Audiotrak ProDigy CUBE
    7922  Audiotrak DR.DAC2 DX [GYROCOM C&C]
 1854  Memory Devices Ltd.
 185b  Compro
@@ -17664,6 +18932,8 @@
    ee93  EasyLogger
 187c  Alienware Corporation
    0511  AlienFX Mobile lighting
+	0513  Gaming Desktop [Aurora R4]
+	0550  LED controller
    0600  Dual Compatible Game Pad
 187f  Siano Mobile Silicon
    0010  Stallar Board
@@ -17691,8 +18961,10 @@
    022b  Portable Hard Drive (Store'n'Go)
    0237  Portable Harddrive
    0243  Flash Drive (Store'n'Go)
+	0245  Store'n'Stay
    0302  Flash Drive
    0304  Store 'n' Go
+	0408  Store 'n' Go
    4123  Store N Go
 18b1  Petalynx
    0037  Maxter Remote Control
@@ -17716,8 +18988,12 @@
    0006  Onda V972 MTP
    0008  Onda V972 PTP (camera)
    0d02  Celkon A88
-	2d00  Android-powered device in accessory mode
-	2d01  Android-powered device in accessory mode with ADB support
+	2d00  Android Open Accessory device (accessory)
+	2d01  Android Open Accessory device (accessory + ADB)
+	2d02  Android Open Accessory device (audio)
+	2d03  Android Open Accessory device (audio + ADB)
+	2d04  Android Open Accessory device (accessory + audio)
+	2d05  Android Open Accessory device (accessory + audio + ADB)
    4e11  Nexus One
    4e12  Nexus One (debug)
    4e13  Nexus One (tether)
@@ -17731,17 +19007,22 @@
    4e42  Nexus 7 (debug)
    4e43  Nexus 7 (PTP)
    4e44  Nexus 7 2012 (PTP)
-	4ee0  Nexus 4 (bootloader)
-	4ee1  Nexus Device (MTP)
-	4ee2  Nexus Device (debug)
-	4ee3  Nexus 4/5/7/10 (tether)
-	4ee4  Nexus 4/5/7/10 (debug + tether)
-	4ee5  Nexus 4 (PTP)
-	4ee6  Nexus 4/5 (PTP + debug)
+	4ee0  Nexus/Pixel Device (fastboot)
+	4ee1  Nexus/Pixel Device (MTP)
+	4ee2  Nexus/Pixel Device (MTP + debug)
+	4ee3  Nexus/Pixel Device (tether)
+	4ee4  Nexus/Pixel Device (tether+ debug)
+	4ee5  Nexus/Pixel Device (PTP)
+	4ee6  Nexus/Pixel Device (PTP + debug)
+	4ee7  Nexus/Pixel Device (charging + debug)
+	4ee8  Nexus/Pixel Device (MIDI)
+	4ee9  Nexus/Pixel Device (MIDI + debug)
+	5033  Pixel earbuds
    7102  Toshiba Thrive tablet
    b004  Pandigital / B&N Novel 9" tablet
    d001  Nexus 4 (fastboot)
    d002  Nexus 4 (debug)
+	d00d  Xiaomi Mi/Redmi 2 (fastboot)
    d109  LG G2x MTP
    d10a  LG G2x MTP (debug)
 18d5  Starline International Group Limited
@@ -17768,8 +19049,16 @@
    3188  ARK3188 UVC Webcam
    3299  Webcam Carrefour
    3366  Bresser Biolux NV
+	5850  CVBS / S-Video Capture Device [UVC]
+18ef  ELV Elektronik AG
+	e014  FS20PCE
+	e015  FS20PCS
+	e01a  Bedien-Anzeige-Terminal
 18f8  [Maxxter]
+	0f97  Optical Gaming Mouse [Xtrem]
    0f99  Optical gaming mouse
+	1142  Optical gaming mouse
+	1486  X5s ZEUS Macro Pro Gaming Mouse
 18fb  Scriptel Corporation
    01c0  ST1501-STN
    01c1  ST1526-STN
@@ -17791,15 +19080,23 @@
 1901  GE Healthcare
    0015  Nemo Tracker
 1908  GEMBIRD
-	1320  PhotoFrame PF-15-1
+	0102  Digital Photo Frame
+	0226  MicroSD Card Reader/Writer
+	1315  Digital Photo Frame
+	1320  DM8261 Flashdisc
+	2070  Honk HK-5002 USB Speaker
+	2220  Buildwin Media-Player
+	2311  Generic UVC 1.00 camera [AppoTech AX2311]
 190d  Motorola GSG
 1914  Alco Digital Devices Limited
 1915  Nordic Semiconductor ASA
    000c  Wireless Desktop nRF24L01 CX-1766
+	0101  HP Prime Wireless Kit [FOK65AA] (Flash mode)
    2233  Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505]
    2234  Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886]
    2235  Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886]
    2236  Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3]
+	7777  Bitcraze Crazyradio (PA) dongle
 191c  Innovative Technology LTD
    4104  Banknote validator NV-150
 1923  FitLinxx
@@ -17833,19 +19130,26 @@
    0085  1950 HID Touchscreen
    0086  1950 HID Touchscreen
    0087  1950 HID Touchscreen
+	0dbf  HID Touchscreen
    0dc2  HID Touchscreen
+1928  Proceq SA
+	0400  Equotip Piccolo
 192f  Avago Technologies, Pte.
    0000  Mouse
    0416  ADNS-5700 Optical Mouse Controller (3-button)
    0616  ADNS-5700 Optical Mouse Controller (5-button)
+	0916  ADNS-2710 Optical Mouse Controller
 1930  Shenzhen Xianhe Technology Co., Ltd.
 1931  Ningbo Broad Telecommunication Co., Ltd.
 1934  Feature Integration Technology Inc. (Fintek)
    0602  F71610 or F71612 Consumer Infrared Receiver/Transceiver
    0702  Integrated Consumer Infrared Receiver/Transceiver
    5168  F71610A or F71612A Consumer Infrared Receiver/Transceiver
+1935  Elektron Music Machines
+	000d  Elektron Digitakt
 1938  Meinberg Funkuhren GmbH & Co. KG
    0501  TCR51USB IRIG Time Code Reader
+	0502  TCR600USB IRIG Time Code Reader
 1941  Dream Link
    8021  WH1080 Weather Station / USB Missile Launcher
 1943  Sensoray Co., Inc.
@@ -17853,40 +19157,59 @@
    2253  Model 2253 Audio/Video Codec Card
    2255  Model 2255 4 Channel Capture Card
    2257  Model 2257 4 Channel Capture Card
+	2263  Model 2263 UVC HD Audio/Video Codec Card
    a250  Model 2250 MPEG and JPEG Capture Card (cold)
    a253  Model 2253 Audio/Video Codec Card (cold)
 1949  Lab126, Inc.
    0002  Amazon Kindle
    0004  Amazon Kindle 3/4/Paperwhite
-	0006  Kindle Fire
+	0006  Amazon Kindle Fire
    0008  Amazon Kindle Fire HD 8.9"
+	000a  Amazon Kindle Fire 2nd generation (2012)
+	0331  Kindle Fire HD 8 (2018)
+	0417  Amazon Zukey; clone of Yubikey 4 OTP+U2F
+	0800  Fire Phone
 194f  PreSonus Audio Electronics, Inc.
    0101  AudioBox 22 VSL
    0102  AudioBox 44 VSL
    0103  AudioBox 1818 VSL
+	0201  FaderPort
    0301  AudioBox
 1951  Hyperstone AG
 1953  Ironkey Inc.
    0202  S200 2GB Rev. 1
 1954  Radiient Technologies
 195d  Itron Technology iONE
+	2030  Func KB-460 Gaming Keyboard
    7002  Libra-Q11 IR remote
    7006  Libra-Q26 / 1.0 Remote
    7777  Scorpius wireless keyboard
    7779  Scorpius-P20MT
+1963  IK Multimedia
+	0005  iRig KEYS
+	0046  UNO Synth
 1965  Uniden Corporation
    0016  HomePatrol-1
+	0018  UBC125XLT
+	001a  BCD436HP Scanner
 1967  CASIO HITACHI Mobile Communications Co., Ltd.
 196b  Wispro Technology Inc.
 1970  Dane-Elec Corp. USA
    0000  Z Mate 16GB
+1973  Spectralink Corporation
+	0002  Pivot recovery
+	0003  Pivot Media Transfer Protocol
+	0004  Pivot Media Transfer Protocol
 1975  Dongguan Guneetal Wire & Cable Co., Ltd.
 1976  Chipsbrand Microelectronics (HK) Co., Ltd.
-	6025  Flash Drive 512 MB
+	1307  microSD Card Reader
+	6025  CBM2090 Flash Drive
 1977  T-Logic
    0111  TL203 MP3 Player and Voice Recorder
 197d  Leuze electronic
    0222  BCL 508i
+1980  Storage Appliance Corporation
+	0808  Clickfree C2 Slimline (527SE)
 1989  Nuconn Technology Corp.
 198f  Beceem Communications Inc.
    0210  BCS200 WiMAX Adapter
@@ -17899,11 +19222,20 @@
    3010  Camera Release 4
    3011  OEM Camera
    3012  e-ImageData Corp. ScanPro
+1997  Shenzhen Riitek Technology Co., Ltd
+	0409  wireless mini keyboard with touchpad
+	2433  wireless mini keyboard with touchpad
 199b  MicroStrain, Inc.
    3065  3DM-GX3-25 Orientation Sensor
 199e  The Imaging Source Europe GmbH
    8101  DFx 21BU04 Camera
+	8457  DFK AFU130-L53 camera
 199f  Benica Corporation
+19a5  HARRIS Corp.
+	0004  Remote NDIS Network Device
+	0012  RF-7800S Secure Personal Radio
+	0401  Mass Storage Device
+	0402  Falcon III RF-7800V family RNDIS
 19a8  Biforst Technology Inc.
 19ab  Bodelin
    1000  ProScope HR
@@ -17920,27 +19252,37 @@
 19b5  B & W Group
 19b6  Infotech Logistic, LLC
 19b9  Data Robotics
+	4b10  Drobo
    8d20  Drobo Elite
 19c2  Futuba
    6a11  MDM166A Fluorescent Display
 19ca  Mindtribe
    0001  Sandio 3D HID Mouse
 19cf  Parrot SA
+	0001  MiniKit Slim handsfree car kit in firmware update mode
+19d1  BYD
 19d2  ZTE WCDMA Technologies MSM
    0001  CDMA Wireless Modem
    0002  MF632/ONDA ET502HS/MT505UP
    0007  TU25 WiMAX Adapter [Beceem BCS200]
+	0017  MF669
    0031  MF110/MF627/MF636
+	0037  ONDA MC503HSA
+	0039  MF100
    0063  K3565-Z HSDPA
    0064  MF627 AU
    0083  MF190
    0103  MF112
    0104  K4505-Z
+	0117  MF667
    0146  MF 195E (HSPA+ Modem)
    0167  MF820 4G LTE
    0172  AX226 WIMAX MODEM (After Modeswitch)
    0325  LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard
    0326  LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard
+	0501  Lever Cell Phone Model Z936L
+	1001  K3805-Z vodafone WCDMA/GSM Modem - storage mode (made by ZTE)
+	1002  K3805-Z vodafone WCDMA/GSM Modem/Networkcard (made by ZTE)
    1008  K3570-Z
    1010  K3571-Z
    1017  K5006-Z vodafone LTE/UMTS/GSM Modem/Networkcard
@@ -17948,6 +19290,7 @@
    1203  MF691 [ T-Mobile webConnect Rocket 2.0]
    1217  MF652
    1218  MF652
+	1270  MF667
    2000  MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
    fff2  Gobi Wireless Modem (QDL mode)
    fff3  Gobi Wireless Modem
@@ -17959,11 +19302,15 @@
 19f7  RODE Microphones
    0001  Podcaster
 19fa  Gampaq Co.Ltd
+	0607  GAME CONTROLLER
    0703  Steering Wheel
+19fd  MTI Instruments Inc.
 19ff  Dynex
    0102  1.3MP Webcam
    0201  Rocketfish Wireless 2.4G Laser Mouse
+	0220  RF-HDWEBLT RocketFish HD WebCam
    0238  DX-WRM1401 Mouse
+	0239  Bluetooth 4.0 Adapter [Broadcom, 1.12, BCM20702A0]
 1a08  Bellwood International, Inc.
 1a0a  USB-IF non-workshop
    badd  USB OTG Compliance test device
@@ -17975,6 +19322,9 @@
 1a2c  China Resource Semico Co., Ltd
    0021  Keyboard
    0024  Multimedia Keyboard
+	2124  Keyboard
+	2d23  Keyboard
+	427c  Backlit Keyboard [Cougar Vantar]
 1a32  Quanta Microsystems, Inc.
    0304  802.11n Wireless LAN Card
 1a34  ACRUX
@@ -17991,6 +19341,11 @@
 1a5a  Tandberg Data
 1a61  Abbott Diabetes Care
    3410  CoPilot System Cable
+	3650  FreeStyle Libre
+	3850  FreeStyle Optium/Precision Neo
+	3950  FreeStyle Libre 2
+1a64  Mastervolt
+	0000  MasterBus Link
 1a6a  Spansion Inc.
 1a6d  SamYoung Electronics Co., Ltd
 1a6e  Global Unichip Corp.
@@ -17999,21 +19354,32 @@
    1008  E-861 PiezoWalk NEXACT Controller
 1a79  Bayer Health Care LLC
    6002  Contour
+	6210  Contour Next Link 2.4 glucometer
+	6300  Contour next link
    7410  Contour Next
+	7800  Contour Plus One
 1a7b  Lumberg Connect  GmbH & Co. KG
 1a7c  Evoluent
    0068  VerticalMouse 3
    0168  VerticalMouse 3 Wireless
    0191  VerticalMouse 4
+	0195  VerticalMouse C Wireless
+1a7e  Meltec Systementwicklung
+	1001  UFT75, UT150, UT60
+	1003  Thermostick
 1a81  Holtek Semiconductor, Inc.
+	1004  Wireless Dongle 2.4 GHZ HT82D40REW
+	1701  Wireless dongle
+	2004  Keyboard
    2203  Laser Gaming mouse
    2204  Optical Mouse
    2205  Laser Mouse
+	4001  Keyboard
 1a86  QinHeng Electronics
    5512  CH341 in EPP/MEM/I2C mode, EPP/I2C adapter
    5523  CH341 in serial mode, usb to serial port converter
    5584  CH341 in parallel mode, usb to printer port converter
-	7523  HL-340 USB-Serial adapter
+	7523  CH340 serial converter
    752d  CH345 MIDI adapter
    7584  CH340S
    e008  HID-based serial adapater
@@ -18027,26 +19393,41 @@
 1aa4  Data Drive Thru, Inc.
 1aa5  UBeacon Technologies, Inc.
 1aa6  eFortune Technology Corp.
+1aab  Silvercreations Software AG
+	7736  sceye (Gen 2)
+	7737  sceye (Gen 3)
+	7738  sceye (Gen 4, 3 Mpix)
+	7750  sceyeS (Gen 5, 5 MPix)
 1aad  KeeTouch
    0001  Touchscreen
 1ab1  Rigol Technologies
+	04b0  DS6000 SERIES
+	04be  DS4000 SERIES
+	04ce  DS1xx4Z/MSO1xxZ series
    0588  DS1000 SERIES
+1ab2  Allied Vision
+	0001  Vision device
 1acb  Salcomp Plc
 1acc  Midiplus Co, Ltd.
    0103  AudioLink plus 4x4 2.9.28
 1ad1  Desay Wire Co., Ltd.
 1ad4  APS
    0002  KM290-HRS
-1adb  SEL C662 Serial Cable
+1adb  Schweitzer Engineering Laboratories, Inc
+	0001  C662 Serial Cable
+	0003  CDC Ethernet Gadget
 1ae4  ic-design Reinhard Gottinger GmbH
 1ae7  X-TENSIONS
    0381  VS-DVB-T 380U (af9015 based)
+	0525  X-Tensions ISDN TA XC-525 [HFC-S USB]
    2001  SpeedLink Snappy Mic webcam (SL-6825-SBK)
    9003  SpeedLink Vicious And Devine Laplace webcam, white (VD-1504-SWT)
    9004  SpeedLink Vicious And Devine Laplace webcam, black (VD-1504-SBK)
 1aed  High Top Precision Electronic Co., Ltd.
 1aef  Conntech Electronic (Suzhou) Corporation
 1af1  Connect One Ltd.
+1af3  Kingsis Technology Corporation
+	0001  ZOWIE Gaming mouse
 1afe  A. Eberle GmbH & Co. KG
    0001  PQ Box 100
 1b04  Meilhaus Electronic GmbH
@@ -18130,16 +19511,25 @@
    1078  BLUDRIVE II CCID
    1079  BLUDRIVE II CCID
    1080  WRITECHIP II CCID
+1b12  Eventide
+	0011  ModFactor
 1b1c  Corsair
    0890  Flash Padlock
    0a00  SP2500 Speakers
    0a60  Vengeance K60 Keyboard
    0c04  Link Cooling Node
+	0c06  RM-Series C-Link Adapter
+	0c0a  Hydro Series H115i Liquid CPU Cooler
+	0c0b  Lighting Node Pro
+	0c0c  Lighting Node Loader
+	0c22  iCUE H150i RGB PRO XT Liquid CPU Cooler
    1a01  Flash Voyager GT
    1a03  Voyager 3.0
    1a09  Voyager GT 3.0
    1a0a  Survivor Stealth Flash Drive
    1a0b  Flash Voyager LS
+	1a0e  Voyager GTX
+	1a14  Voyager Vega
    1a15  Voyager Slider Flash Drive
    1a90  Flash Voyager GT
    1ab1  Voyager
@@ -18149,12 +19539,30 @@
    1b09  Vengeance K70R keyboard
    1b11  K95 RGB Mechanical Gaming Keyboard
    1b13  Vengeance K70RGB keyboard
+	1b20  STRAFE RGB Gaming Keyboard
+	1b2d  K95 RGB Platinum Keyboard [RGP0056]
+	1b2e  Corsair Corsair Gaming M65 Pro RGB Mouse
+	1b2f  Sabre RGB [CH-9303011-XX]
+	1b3d  Corsair Corsair Gaming K55 RGB Keyboard
+	1b5e  Harpoon Wireless Mouse
+	1b65  Harpoon Wireless Dongle
    1c00  Controller for Corsair Link
+	1c02  AX1500i Power Supply
+	1c05  HX750i Power Supply
+	1c07  HX1000i Power Supply
+	1c08  HX1200i Power Supply
+	1c0b  RM750i Power Supply
    1c0c  RM850i Power Supply
+	1c1a  Corsair CORSAIR Lighting Node CORE
+1b1e  General Imaging / General Electric
+	1003  A1250
 1b1f  eQ-3 Entwicklung GmbH
    c00f  HM-CFG-USB/HM-CFG-USB-2 [HomeMatic Configuration adapter]
+	c020  HmIP-RFUSB
 1b20  MStar Semiconductor, Inc.
 1b22  WiLinx Corp.
+1b24  Telegent Systems, Inc.
+	4001  TLG2300 Hybrid TV Device
 1b26  Cellex Power Products, Inc.
 1b27  Current Electronics Inc.
 1b28  NAVIsis Inc.
@@ -18189,6 +19597,7 @@
 1b3f  Generalplus Technology Inc.
    0c52  808 Camera #9 (mass storage mode)
    2002  808 Camera #9 (web-cam mode)
+	2003  GPD6000 [Digital MP3 Player]
 1b47  Energizer Holdings, Inc.
    0001  CHUSB Duo Charger (NiMH AA/AAA USB smart charger)
 1b48  Plastron Precision Co., Ltd.
@@ -18219,6 +19628,7 @@
 1b5a  Chao Zhou Kai Yuan Electric Co., Ltd.
 1b65  The Hong Kong Standards and Testing Centre Ltd.
 1b71  Fushicai
+	0050  Encore ENUTV-4 Analog TV Tuner
    3002  USBTV007 Video Grabber [EasyCAP]
 1b72  ATERGI TECHNOLOGY CO., LTD.
 1b73  Fresco Logic
@@ -18238,6 +19648,8 @@
    d398  DVB-T receiver [RTL2832U]
    d700  FM Radio SnapMusic Mobile 700 (FM700)
    e297  Conceptronic DVB-T CTVDIGRCU V3.0
+	e302  CVBS / S-Video Capture Device [Pinnacle Dazzle / UB315-E]
+	e34c  UB435-Q ATSC TV Stick
    e383  DVB-T UB383-T [af9015]
    e385  DVB-T UB385-T [af9015]
    e386  DVB-T UB385-T [af9015]
@@ -18260,29 +19672,92 @@
 1ba2  Lite Metals & Plastic (Shenzhen) Co., Ltd.
 1ba4  Ember Corporation
    0001  InSight USB Link
+	0002  EM358 Virtual COM Port
 1ba6  Abilis Systems
 1ba8  China Telecommunication Technology Labs
 1bad  Harmonix Music
-	0002  Guitar for Xbox 360
-	0003  Drum Kit for Xbox 360
+	0002  Rock Band Guitar for Xbox 360
+	0003  Rock Band Drum Kit for Xbox 360
+	0130  Ion Drum Rocker for Xbox 360
+	028e  Controller
+	3330  Rock Band 3 Keyboard wii interface
+	f016  Controller
+	f018  Street Fighter IV SE FightStick for Xbox 360
+	f019  BrawlStick for Xbox 360
+	f021  Ghost Recon Future Soldier Gamepad for Xbox 360
+	f023  MLG Pro Circuit Controller for Xbox 360
+	f025  Call of Duty Controller for Xbox 360
+	f027  FPS Pro Controller for Xbox 360
+	f028  Street Fighter IV FightPad for Xbox 360
+	f02e  FightPad
+	f030  MC2 MicroCON Racing Wheel for Xbox 360
+	f036  MicroCON Gamepad Pro for Xbox 360
+	f038  Street Fighter IV FightStick TE for Xbox 360
+	f039  Marvel VS Capcom 2 Tournament Stick for Xbox 360
+	f03a  Street Fighter X Tekken FightStick Pro for Xbox 360
+	f03d  Street Fighter IV Arcade Stick TE for Xbox 360
+	f03e  MLG Arcade FightStick TE for Xbox 360
+	f03f  Soulcalibur FightStick for Xbox 360
+	f042  Arcade FightStick TE S+ for Xbox 360
+	f080  FightStick TE2 for Xbox 360
+	f501  Horipad EX2 Turbo for Xbox 360
+	f502  Real Arcade Pro.VX SA for Xbox 360
+	f503  Fighting Stick VX for Xbox 360
+	f504  Real Arcade Pro.EX
+	f505  Fighting Stick EX2B for Xbox 360
+	f506  Real Arcade Pro.EX Premium VLX for Xbox 360
+	f900  Controller
+	f901  GameStop Controller
+	f903  Tron Controller for Xbox 360
+	f904  PDP Versus Fighting Pad for Xbox 360
+	f906  Mortal Kombat FightStick for Xbox 360
+	f907  Afterglow Gamepad
+	fa01  Gamepad
+	fd00  Razer Onza Tournament Edition
+	fd01  Razer Onza Classic Edition
 1bae  Vuzix Corporation
    0002  VR920 Immersive Eyewear
 1bbb  T & A Mobile Phones
+	0003  Alcatel one touch 4030D modem connection
+	0017  HSPA Data Card
+	007a  Alcatel OneTouch (firmware upgrade mode)
    011e  Alcatel One Touch L100V / Telekom Speedstick LTE II
+	0169  Alcatel ONE TOUCH Fierce
+	0195  Alcatel OneTouch L850V / Telekom Speedstick LTE
+	a00e  Vodafone Smart Tab 4G
+	f000  Alcatel OneTouch (mass storage mode)
    f017  Alcatel One Touch L100V / Telekom Speedstick LTE II
+1bbd  Videology Imaging Solutions, Inc.
+	0060  1.3MP Mono Camera
+	0066  1.3MP Mono Camera
+	0067  1.3MP Mono Camera
+1bc0  Beijing Senseshield Technology Co.,Ltd.
+	0013  Elitee-e
+	0014  Elite4
+	0020  iToken
+	0021  Mikey
+	0051  Elite5
+	0055  Elite5 v3.x
+	485d  EliteIV
 1bc4  Ford Motor Co.
 1bc5  AVIXE Technology (China) Ltd.
 1bc7  Telit Wireless Solutions
    0020  HE863
    0021  HE910
+	0022  GE910-QUAD
    0023  HE910-D ECM
+	0032  LE910-EU V2
    1003  UC864-E
    1004  UC864-G
    1005  CC864-DUAL
    1006  CC864-SINGLE
    1010  DE910-DUAL
    1011  CE910-DUAL
-	1200  LE920
+	1012  UE910 V2
+	1101  ME910C1
+	110a  ME310
+	1200  LE920 (old firmware)
+	1201  LE910 / LE920
 1bce  Contac Cable Industrial Limited
 1bcf  Sunplus Innovation Technology Inc.
    0005  Optical Mouse
@@ -18290,18 +19765,28 @@
    053a  Targa Silvercrest OMC807-C optische Funkmaus
    05c5  SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
    05cf  Micro keyboard & mouse receiver
+	08a0  Gaming mouse [Philips SPK9304]
    0c31  SPIF30x Serial-ATA bridge
+	2281  SPCA2281 Web Camera
    2880  Dell HD Webcam
+	2883  Asus Webcam
    2885  ASUS Webcam
    2888  HP Universal Camera
+	2895  Dell Integrated Webcam
    28a2  Dell Integrated Webcam
    28a6  DELL XPS Integrated Webcam
    28ae  Laptop Integrated Webcam HD
    28bd  Dell Integrated HD Webcam
    2985  Laptop Integrated Webcam HD
    2b83  Laptop Integrated Webcam FHD
+	2b91  Dell E5570 integrated webcam
+	2b97  Laptop Integrated Webcam FHD
+	2c6e  Laptop Integrated WebCam HD
 1bd0  Hangzhou Riyue Electronic Co., Ltd.
 1bd5  BG Systems, Inc.
+1bda  University Of Southampton
+	0010  Power Board v4 Rev B
+	0011  Student Robotics SBv4B
 1bde  P-TWO INDUSTRIES, INC.
 1bef  Shenzhen Tongyuan Network-Communication Cables Co., Ltd
 1bf0  RealVision Inc.
@@ -18318,12 +19803,19 @@
    6968  Touch Screen
 1c02  Kreton Corporation
 1c04  QNAP System Inc.
+	2074  ASM1074 High-Speed hub
+	3074  ASM1074 SuperSpeed hub
+1c05  Shenxhen Stager Electric
+	ea75  G540 Programmer
 1c0c  Ionics EMS, Inc.
    0102  Plug Computer
 1c0d  Relm Wireless
 1c10  Lanterra Industrial Co., Ltd.
+1c11  Input Club Inc.
+	b04d  ErgoDox Infinity
 1c13  ALECTRONIC LIMITED
 1c1a  Datel Electronics Ltd.
+	0100  Action Replay DS "3DS/DSi/DS/Lite Compatible"
 1c1b  Volkswagen of America, Inc.
 1c1f  Goldvish S.A.
 1c20  Fuji Electric Device Technology Co., Ltd.
@@ -18331,6 +19823,17 @@
 1c22  ZHONGSHAN CHIANG YU ELECTRIC CO., LTD.
 1c26  Shanghai Haiying Electronics Co., Ltd.
 1c27  HuiYang D & S Cable Co., Ltd.
+1c28  PMD Technologies
+	c003  CamCube
+	c004  CamBoard
+	c005  ConceptCam
+	c006  CamBoard 22
+	c007  CamBoard nano
+	c008  CamBoard mod
+	c009  CamBoard plus
+	c00a  DigiCam
+	c00d  CamBoard pico LDD
+	c00f  CamBoard pico
 1c29  Elster GmbH
    0001  ExMFE5 Simulator
    10fc  enCore device
@@ -18338,6 +19841,7 @@
 1c34  SpringCard
    7241  Prox'N'Roll RFID Scanner
 1c37  Authorizer Technologies, Inc.
+	6190  U2F Fido-compliant cryptotoken
 1c3d  NONIN MEDICAL INC.
 1c3e  Wep Peripherals
 1c40  EZPrototypes
@@ -18345,27 +19849,49 @@
    0534  i2c-tiny-usb interface
    0535  glcd2usb interface
    0536  Swiss ColorPAL
+	0537  MIST Board
 1c49  Cherng Weei Technology Corp.
+1c4b  Geratherm Medical AG
+	026f  Spirostik
 1c4f  SiGma Micro
    0002  Keyboard TRACER Gamma Ivory
    0003  HID controller
    000e  Genius KB-120 Keyboard
    0026  Keyboard
+	0032  Optical Mouse with Scroll Wheel
+	0034  XM102K Optical Wheel Mouse
+	0063  Touchpad (integrated in detachable keyboard of Chuwi SurBook)
+	0065  Optical Wheel Mouse [Rapoo N1130]
    3000  Micro USB Web Camera
    3002  WebCam SiGma Micro
+1c57  Zalman Tech Co., Ltd.
+	1e45  FPSGUN FG1000 Mouse
 1c6b  Philips & Lite-ON Digital Solutions Corporation
+	a220  DVD Writer Slimtype eSAU108
    a222  DVD Writer Slimtype eTAU108
+	a223  DVD Writer Slimtype eUAU108
 1c6c  Skydigital Inc.
+1c71  Humanware Inc
+	c004  Braille Note Apex (braille terminal mode)
 1c73  AMT
    861f  Anysee E30 USB 2.0 DVB-T Receiver
+1c75  Arturia
+	0288  KeyStep
 1c77  Kaetat Industrial Co., Ltd.
 1c78  Datascope Corp.
 1c79  Unigen Corporation
 1c7a  LighTuning Technology Inc.
+	0577  Fingerprint Sensor
+	0603  ES603 Swipe Fingerprint Sensor
    0801  Fingerprint Reader
 1c7b  LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD.
+1c82  Atracsys
+	0200  spryTrac
 1c83  Schomaecker GmbH
    0001  RS150 V2
+	0002  RFID card reader
+	0003  Communicator
+	0005  Mobile RFID Reader
 1c87  2N TELEKOMUNIKACE a.s.
 1c88  Somagic, Inc.
    0007  SMI Grabber (EasyCAP DC60+ clone) (no firmware) [SMI-2021CBE]
@@ -18386,9 +19912,11 @@
 1cb6  IdeaCom Technology Inc.
    6681  IDC6681
 1cbe  Luminary Micro Inc.
+	0002  CDC serial port [TivaWare]
    00fd  In-Circuit Debug Interface
    00ff  Stellaris ROM DFU Bootloader
    0166  CANAL USB2CAN
+	0240  McGill Robotics TM4C Microcontroller
 1cbf  FORTAT SKYMARK INDUSTRIAL COMPANY
 1cc0  PlantSense
 1cca  NextWave Broadband Inc.
@@ -18414,6 +19942,7 @@
    0023  deRFusbSniffer Sub-GHz
    0025  deRFusb23E06
    0027  deRFusb13E06
+	0030  ZigBee gateway [ConBee II]
 1cfc  ANDES TECHNOLOGY CORPORATION
 1cfd  Flextronics Digital Design Japan, LTD.
 1d03  iCON
@@ -18424,6 +19953,8 @@
    1026  HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel]
 1d0a  Johnson Controls, Inc. The Automotive Business Unit
 1d0b  HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD.
+1d0d  TDKMedia
+	0214  Trans-It Drive
 1d0f  Sonix Technology Co., Ltd.
 1d14  ALPHA-SAT TECHNOLOGY LIMITED
 1d17  C-Thru Music Ltd.
@@ -18432,20 +19963,28 @@
    1101  DK DVB-T Dongle
    1102  DK mini DVB-T Dongle
    1103  DK 5217 DVB-T Dongle
+	1104  MSI DigiVox Micro HD
    6105  Video grabber
+	610a  Video grabber
    8202  DK DVBC/T DONGLE
 1d1f  Diostech Co., Ltd.
 1d20  SAMTACK INC.
 1d27  ASUS
+	0601  Xtion
 1d34  Dream Cheeky
-	0001  Dream Cheeky Fidget
-	0004  Dream Cheeky Webmail Notifier
-	0008  Dream Cheeky button
-	000a  Dream Cheeky Mailbox Friends Alert
-	000d  Dream Cheeky Big Red Button
-	0013  Dream Cheeky LED Message Board
+	0001  Fidget
+	0002  Fidget (Basketball)
+	0003  Fidget (Golf Ball)
+	0004  Webmail Notifier
+	0008  button
+	000a  Mailbox Friends Alert
+	000d  Big Red Button
+	0013  LED Message Board
+	0020  Stress Ball
 1d45  Touch
    1d45  Foxlink Optical touch sensor
+	459d  BenQ F5
+	465c  Harrier Mini by EE
 1d4d  PEGATRON CORPORATION
    0002  Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device
    000c  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
@@ -18466,6 +20005,61 @@
    5123  Neo1973/FreeRunner internal USB CSR4 module
    5124  Neo1973/FreeRunner Bluetooth Device ID service
    5300  Rockbox
+	530e  iriver H10 20GB (Rockbox)
+	530f  iriver H10 5/6GB (Rockbox)
+	5314  Apple iPod Color/Photo (Rockbox)
+	5315  Apple iPod Nano 1g (Rockbox)
+	5316  Apple iPod Video (Rockbox)
+	5318  Apple iPod 4g Grayscale (Rockbox)
+	5319  Apple iPod Mini 1g (Rockbox)
+	531a  Apple iPod Mini 2g (Rockbox)
+	531c  Apple iPod Nano 2g (Rockbox)
+	531d  Apple iPod Classic/6G (Rockbox)
+	5321  Cowon D2 (Rockbox)
+	5329  Toshiba Gigabeat S (Rockbox)
+	5332  Sandisk Sansa e200 series (Rockbox)
+	5334  Sandisk Sansa c200 series (Rockbox)
+	5337  Sandisk Sansa Clip (Rockbox)
+	5338  Sandisk Sansa e200v2 series (Rockbox)
+	5339  Sandisk Sansa m200 v4 series (Rockbox)
+	533a  Sandisk Sansa Fuze (Rockbox)
+	533b  Sandisk Sansa c200v2 series (Rockbox)
+	533c  Sandisk Sansa Clipv2 (Rockbox)
+	533e  Sandisk Sansa Clip+ (Rockbox)
+	533f  Sandisk Sansa Fuze v2 (Rockbox)
+	5340  Sandisk Sansa Fuze+ (Rockbox)
+	5341  Sandisk Sansa Zip (Rockbox)
+	5342  Sandisk Sansa Connect (Rockbox)
+	5346  Olympus M:Robe 500i (Rockbox)
+	5347  Olympus m:robe MR-100 (Rockbox)
+	5359  Creative Zen X-Fi Style (Rockbox)
+	535d  Creative Zen X-Fi2 (Rockbox)
+	535e  Creative Zen X-Fi3 (Rockbox)
+	5360  Creative Zen X-Fi (Rockbox)
+	5361  Creative ZEN Mozaic (Rockbox)
+	5362  Creative Zen (Rockbox)
+	5364  Philips GoGear SA9200 (Rockbox)
+	5365  Philips GoGear HDD16x0 (Rockbox)
+	5366  Philips GoGear HDD63x0 (Rockbox)
+	5378  Onda VX747 (Rockbox)
+	5379  Onda VX767 (Rockbox)
+	537b  Onda VX777 (Rockbox)
+	538c  Samsung YH-820 (Rockbox)
+	538d  Samsung YH-920 (Rockbox)
+	538e  Samsung YH-925 (Rockbox)
+	53a0  Packard Bell Vibe 500 (Rockbox)
+	53b4  Rockchip 27xx generic (Rockbox)
+	53be  HiFiMAN HM-60x (Rockbox)
+	53bf  HiFiMAN HM-801 (Rockbox)
+	53d2  HiFi E.T. MA9 (Rockbox)
+	53d3  HiFi E.T. MA9C (Rockbox)
+	53d4  HiFi E.T. MA8 (Rockbox)
+	53d5  HiFi E.T. MA8C (Rockbox)
+	53dc  Sony NWZ-E370/E380 series (Rockbox)
+	53dd  Sony NWZ-E360 series (Rockbox)
+	53e6  IHIFI 760 (Rockbox)
+	53e7  IHIFI 960 (Rockbox)
+	53ff  Generic Rockbox device
    6000  Ubertooth Zero
    6001  Ubertooth Zero (DFU)
    6002  Ubertooth One
@@ -18495,6 +20089,7 @@
    601a  Paparazzi Lisa/M
    601b  IST-2 chronograph for bullet speeds
    601c  EPOSMote II
+	601d  UDS18B20 temperature sensor
    601e  5x5 STM32 prototyping board
    601f  uNSF
    6020  Toad3
@@ -18503,8 +20098,10 @@
    6023  Pixelkit
    6024  Illucia
    6025  Keyglove (HID)
+	6026  Keyglove (Serial)
    6027  Key64 Keyboard
    6028  Teensy 2.0 Development Board [ErgoDox Keyboard]
+	6029  Marlin 2.0 (Serial)
    602a  Marlin 2.0 (Mass Storage)
    602b  FPGALink
    602c  5nes5snes (5x8)
@@ -18513,6 +20110,7 @@
    602f  K-copter
    6030  USB-oscope
    6031  Handmade GSM GPS tracker
+	6032  ncrmnt.org uISP
    6033  frobiac / adnw keyboard
    6034  Tiflomag Ergo 2
    6035  FreeLaserTag Gun
@@ -18547,7 +20145,12 @@
    6052  APB Team Robotic Development Board
    6053  Darkgame Controller
    6054  Satlab/AAUSAT3 BlueBox
+	6055  RADiuS ER900TRS-02 transciever with SMA Connector
    6056  The Glitch
+	6057  OpenPipe MIDI Shield
+	6058  Novena OTG port
+	6059  xser serial
+	605a  Daisho test
    605b  RfCat YARD Stick One
    605c  YARD Stick One bootloader
    605d  Funky Sensor v2
@@ -18555,6 +20158,7 @@
    605f  Small DIP package Cypress FX2
    6060  Data logger using the Cypress FX2
    6061  Power Manager
+	6062  WhiteRabbit console and Wishbone bridge
    6063  CPC FPGA
    6064  CPC FPGA (DFU)
    6065  CPC FPGA (Serial)
@@ -18567,6 +20171,7 @@
    606c  Blinkytape full-color light tape
    606d  TinyG open source motion controller
    606e  Reefangel Evolution 1.0
+	606f  Geschwister Schneider CAN adapter
    6070  Open Pinball Project
    6071  The Glitch HID
    6072  The Glitch Disk
@@ -18576,10 +20181,12 @@
    6076  Vultureprog BIOS chip programmer
    6077  PaintDuino
    6078  DTplug
+	6079  Mood Light
    607a  Fadecandy
    607b  RCDongle for IR remote control
    607c  OpenVizsla USB sniffer/analyzer
    607d  Spark Core Arduino-compatible board with WiFi
+	607e  OSHUG Wuthering multi-tool
    607f  Spark Core Arduino-compatible board with WiFi (bootloader)
    6080  arcin arcade controller
    6081  BladeRF (bootloader)
@@ -18588,6 +20195,7 @@
    6084  arcin arcade controller (DFU)
    6085  IRKit for controlloing home electronics from iOS devices
    6086  OneRNG entropy device
+	6087  Blinkytape (alternate endpoint config)
    6088  picp PIC16F145x based PIC16F145x programmer
    6089  Great Scott Gadgets HackRF One SDR
    608a  BLEduino
@@ -18625,6 +20233,9 @@
    60aa  Blinky Light Controller
    60ab  AllPixel
    60ac  OpenBLT generic microcontroller (bootloader)
+	60ad  Clasic Gamepad Adapter (NES)
+	60ae  Clasic Gamepad Adapter (N64)
+	60af  Clasic Gamepad Adapter (DB9)
    60b0  Waterott Arduino based Clock (caterina bootloader)
    60b1  Drinkbot (processing)
    60b2  Drinkbot (OTG-tablet support)
@@ -18640,9 +20251,12 @@
    60bd  Open Source control interface for multimedia applications
    60be  Pixelmatix Aurora (bootloader)
    60bf  Pixelmatix Aurora
+	60c0  Nucular Keyboard adapter
    60c1  BrewBit Model-T pOSHW temperature controller for homebrewers (bootloader)
    60c2  BrewBit Model-T pOSHW temperature controller for homebrewers
    60c3  X Antenna Tracker arduino board
+	60c4  CAN bus communication device
+	60c5  PIC16F1 bootloader
    60c6  USBtrng hardware random number generator
    60c7  Zubax GNSS positioning module for light UAV systems
    60c8  Xlink data transfer and control system for Commodore C64
@@ -18650,6 +20264,7 @@
    60ca  FinalKey password manager
    60cb  PteroDAQ Data Acquisition on FRDM-KL25Z and future boards
    60cc  LamDiNao
+	60cd  Open Lighting DMX512 / RDM widget
    60de  Cryptech.is random number generator
    60df  Numato Opsis HDMI2USB board (unconfigured)
    60e0  Numato Opsis HDMI2USB board (JTAG Programming Mode)
@@ -18663,7 +20278,10 @@
    60e8  Alpen Clack keyboard
    60e9  keyman64 keyboard itercepter
    60ea  Wiggleport FPGA-based I/O board
-	60ec  Duet 3D Printer Controller
+	60eb  candleLight CAN adapter
+	60ec  Duet 2 WiFi or Duet 2 Ethernet 3D printer control electronics
+	60ed  Duet 2 Maestro 3D printer control electronics
+	60ee  Duet 3 motion control electronics
    60f0  UDAD-T1 data aquisition device (boot)
    60f1  UDAD-T1 data aquisition device
    60f2  UDAD-T2 data aquisition device (boot)
@@ -18679,18 +20297,28 @@
    6108  Myriad-RF LimeSDR
    610c  Magic Keys (boot)
    610d  Magic Keys
+	6114  MIDI key
+	6118  Thomson MO5 keyboard
+	6122  Ultimate Hacking Keyboard
+	614c  dwtk In-Circuit Emulator
    8085  Box0 (box0-v5)
-	cc15  rad1o badge for CCC congress 2015
+	cc15  rad1o badge for CCC summer camp 2015
 1d57  Xenta
    0005  Wireless Receiver (Keyboard and Mouse)
    0006  Wireless Receiver (RC Laser Pointer)
    000c  Optical Mouse
+	130f  2.4Ghz wireless optical mouse receiver
    2400  Wireless Mouse Receiver
    32da  2.4GHz Receiver (Keyboard and Mouse)
    83d0  Click-mouse!
    ac01  Wireless Receiver (Keyboard and Mouse)
+	ac02  ViFit Activity Tracker
+	ac08  RFID Receiver (Keyboard)
    ad02  SE340D PC Remote Control
+	ad03  [T3] 2.4GHz and IR Air Mouse Remote Control
    af01  AUVIO Universal Remote Receiver for PlayStation 3
+	af03  Wireless Receiver
+	fa20  2.4GHz Wireless Reciever (Mini Keyboard & Mouse)
 1d5b  Smartronix, Inc.
 1d5c  Fresco Logic
    2000  FL2000/FL2000DX VGA/DVI/HDMI Adapter
@@ -18705,14 +20333,25 @@
    0104  Multifunction Composite Gadget
    0105  FunctionFS Gadget
    0200  Qemu Audio Device
+1d88  Mahr GmbH
+	0001  Measurement Device [MarECon]
+	0002  Probe
+	0003  Surface Measurement [PS10]
 1d90  Citizen
    201e  PPU-700
+	2037  CL-S631 Barcode Printer
+	20f0  Thermal Receipt Printer [CT-E351]
 1d9d  Sigma Sport
    1010  Docking Station Topline 2009
    1011  Docking Station Topline 2012
+	1012  Docking Station Topline 2016
+1dd2  Leo Bodnar Electronics Ltd
+1dd3  Dajc Inc.
+	0001  Expert I/O 1000
 1de1  Actions Microelectronics Co.
    1101  Generic Display Device (Mass storage mode)
    c101  Generic Display Device
+1de6  MICRORISC s.r.o.
 1e0e  Qualcomm / Option
    f000  iCON 210 UMTS Surfstick
 1e10  Point Grey Research, Inc.
@@ -18740,23 +20379,47 @@
    040c  LPC2378 [Robotino XT Bootloader]
    040d  LPC2378 [Robotino 3]
    040e  LPC2378 [Robotino 3 Bootloader]
+	040f  LPC2148 [Robotino gripper]
+	0410  LPC2148 [Robotino IR panel]
    0501  CP2102 [CMSP]
    0601  CMMP-AS
+	0602  FTDI232 [CMMS]
+1e2d  Gemalto M2M GmbH
+	004f  EGS3 GSM/GPRS modem
+	0054  PH8 wireless module
+	0058  Wireless Module [Cinterion EHS6]
+	0059  Wireless Module [Cinterion BGx]
+	005b  Zoom 4625 Modem
+	0061  ALSx PLSx LTE modem
+	00a0  Cinterion ELS31-V
 1e3d  Chipsbank Microelectronics Co., Ltd
+	198a  Flash Disk
    2093  CBM209x Flash Drive (OEM)
    4082  CBM4082 SD Card Reader
 1e41  Cleverscope
    0001  CS328A PC Oscilloscope
+	0004  CS448
+1e44  SHIMANO INC.
+	7220  SM-BCR2
 1e4e  Cubeternet
    0100  WebCam
    0102  GL-UPC822 UVC WebCam
+	0109  EtronTech CMOS based eSP570 WebCam [Onyx Titanium TC101]
 1e54  TypeMatrix
    2030  2030 USB Keyboard
 1e68  TrekStor GmbH & Co. KG
    001b  DataStation maxi g.u
+	004c  DataStation Pocket Click
    0050  DataStation maxi light
+	1045  ST70408-3 [SurfTab breeze 7.0 quad 3G] (MTP Mode)
+	1046  ST70408-3 [SurfTab breeze 7.0 quad 3G] (PTP Mode)
 1e71  NZXT
    0001  Avatar Optical Mouse
+	170e  Kraken X
+	1711  Grid+ V3
+	1714  Smart Device
+	1715  Kraken M22
+	2006  Smart Device V2
 1e74  Coby Electronics Corporation
    2211  MP300
    2647  2 GB 2 Go Video MP3 Player [MP601-2G]
@@ -18765,18 +20428,124 @@
    6511  MP705-8G MP3 player
    6512  MP705-4G
    7111  MP957 Music and Video Player
+1e7b  Zurich Instruments
+	0002  HF2
+	0003  UHF
+	0004  MFLI
 1e7d  ROCCAT
    2c24  Pyra Mouse (wired)
+	2c2e  Lua Mouse
+	2c38  Kiro Mouse
    2ced  Kone Mouse
+	2cee  Kova 2016 Gray Mouse
+	2cef  Kova 2016 White Mouse
+	2cf0  Kova 2016 Black Mouse
    2cf6  Pyra Mouse (wireless)
-	2d50  Kova+ Mouse
-	2d51  Kone+ Mouse
+	2d50  Kova[+] Mouse
+	2d51  Kone[+] Mouse
+	2d5a  Savu Mouse
+	2db4  Kone Pure Optical Mouse
+	2dbe  Kone Pure Mouse
+	2dbf  Kone Pure Military Mouse
+	2dc2  Kone Pure Optical Black Mouse
+	2dcb  Kone Pure SE(L) Mouse
    2e22  Kone XTD Mouse
+	2e23  Kone XTD Optical Mouse
+	2e27  Kone AIMO Mouse
+	2e4a  Tyon Black Mouse
+	2e4b  Tyon White Mouse
+	2e7c  Nyth Black Mouse
+	2e7d  Nyth White Mouse
+	2f76  Sova Keyboard
+	2f94  Sova MK Keyboard
+	2fa8  Suora Keyboard
+	2fc6  Skeltr Keyboard
+	2fda  Ryos MK FX Keyboard
    30d4  Arvo Keyboard
+	3138  Ryos MK Keyboard
+	316a  Ryos TKL Keyboard
+	319c  Isku Keyboard
+	31ce  Ryos MK Glow Keyboard
+	3232  Ryos MK Pro Keyboard
+	3246  Suora FX Keyboard
+	3264  Isku FX Keyboard
+1e8e  Airbus Defence and Space
+	6001  P8GR
+1e91  Other World Computing
+	b0b1  miniStack
 1ea7  SHARKOON Technologies GmbH
+	0030  Trust GXT 158 Orna Laser Gaming Mouse
+	0064  2.4GHz Wireless rechargeable vertical mouse [More&Better]
    0066  [Mediatrack Edge Mini Keyboard]
+	0907  Keyboard
+	1002  Vintorez Gaming Mouse
    2007  SHARK ZONE K30 Illuminated Gaming Keyboard
+1eab  Fujian Newland Computer Co., Ltd
+	0103  HR200 Barcode scanner engine (HID keyboard)
+	0106  HR200 Barcode scanner engine (Serial CDC)
+	0110  HR200 Barcode scanner engine (HID Pos)
+	0c03  HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (HID keyboard)
+	0c06  HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (USB Serial CDC)
+	0c10  HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (HID Pos)
+	0d03  EM2028 Barcode scanner engine (HID keyboard)
+	0d06  EM2028 Barcode scanner engine (Serial CDC)
+	0d10  EM2028 Barcode scanner engine (HID Pos)
+	1303  EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (HID keyboard)
+	1306  EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (USB serial CDC)
+	1310  EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (HID Pos)
+	1403  HR15-xx Barcode scanner engine (HID keyboard)
+	1406  HR15-xx Barcode scanner engine (Serial CDC)
+	1410  HR15-xx Barcode scanner engine (HID Pos)
+	1603  FM100-M/3250 Barcode scanner engine (HID keyboard)
+	1606  FM100-M/3250 Barcode scanner engine (Serial CDC)
+	1610  FM100-M/3250 Barcode scanner engine (HID Pos)
+	1903  EM1300 Barcode scanner engine (HID keyboard)
+	1906  EM1300 Barcode scanner engine (Serial CDC)
+	1910  EM1300 Barcode scanner engine (HID Pos)
+	1a03  HR3290 corded/HR22 Barcode scanner engine (HID keyboard)
+	1a06  HR3290 corded/HR22 Barcode scanner engine (Serial CDC)
+	1a10  HR3290 corded/HR22 Barcode scanner engine (HID Pos)
+	1c03  HR2150 Barcode scanner engine (HID keyboard)
+	1c06  HR2150 Barcode scanner engine (Serial CDC)
+	1c10  HR2150 Barcode scanner engine (HID Pos)
+	1d03  FM430 Barcode scanner engine (HID keyboard)
+	1d06  FM430 Barcode scanner engine (Serial CDC)
+	1d10  FM430 Barcode scanner engine (HID Pos)
+	1e03  HR42 Barcode scanner engine (HID keyboard)
+	1e06  HR42 Barcode scanner engine (Serial CDC)
+	1e10  HR42 Barcode scanner engine (HID Pos)
+	1f03  HR11+ Barcode scanner engine (HID keyboard)
+	1f06  HR11+ Barcode scanner engine (Serial CDC)
+	1f10  HR11+ Barcode scanner engine (HID Pos)
+	2003  EM2037v2 Barcode scanner engine (HID keyboard)
+	2006  EM2037v2 Barcode scanner engine (Serial CDC)
+	2010  EM2037v2 Barcode scanner engine (HID Pos)
+	8003  EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (HID keyboard)
+	8006  EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (USB Serial CDC)
+	8010  EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (HID Pos)
+	8203  EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (HID keyboard)
+	8206  EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (USB Serial CDC)
+	8210  EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (HID Pos)
+	8303  HR2160 Barcode scanner engine (HID keyboard)
+	8306  HR2160 Barcode scanner engine (Serial CDC)
+	8310  HR2160 Barcode scanner engine (HID Pos)
+1eaf  Leaflabs
+	0003  Maple DFU interface
+	0004  Maple serial interface
+1eb8  Modacom Co., Ltd.
+	7f00  MW-U3500 WiMAX adapter
 1ebb  NuCORE Technology, Inc.
+1ecb  AMTelecom
+	02e2  JMR1140 [Jiofi]
+1ed8  FENDER MUSICAL INSTRUMENTS CORPORATION
+	0004  Mustang I/II
+	0005  Mustang III/IV/V
+	0006  Mustang I/II [Firmware Update]
+	0007  Mustang III/IV/V [Firmware Update]
+	0010  Mustang Mini
+	0011  Mustang Mini [Firmware Update]
+	0014  Mustang I (V.2)
+	0016  Mustang IV v.2
 1eda  AirTies Wireless Networks
    2012  Air2210 54 Mbps Wireless Adapter
    2210  Air2210 54 Mbps Wireless Adapter
@@ -18784,6 +20553,8 @@
    2410  Air2410 300 Mbps Wireless Adapter
 1edb  Blackmagic design
    bd3b  Intensity Shuttle
+	bd46  Mini Converter Analog to SDI
+	bd75  2.5K Cinema Camera (BMCC)
 1ee8  ONDA COMMUNICATION S.p.a.
    0014  MT833UP
 1ef6  EADS Deutschland GmbH
@@ -18793,40 +20564,73 @@
    5545  Cassidian SSDC Adapter III
    5648  RIU CSMU/BSD
    564a  Cassidian RIU CSMU/BSD Simulator
+1f0c  CMX Systems
+	2000  HP StreamSmart 410 [NW278AA]
 1f28  Cal-Comp
    0020  CDMA USB Modem A600
    0021  CD INSTALLER USB Device
-1f3a  Onda (unverified)
-	efe8  V972 tablet in flashing mode
+1f3a  Allwinner Technology
+	1000  Prestigio PER3464B ebook reader (Mass storage mode)
+	1002  mediacom XPRO 415
+	1010  Android device in fastboot mode
+	efe8  sunxi SoC OTG connector in FEL/flashing mode
 1f44  The Neat Company
    0001  NM-1000 scanner
 1f48  H-TRONIC GmbH
    0627  Data capturing system
    0628  Data capturing and control module
 1f4d  G-Tek Electronics Group
+	a115  EVOLVEO XtraTV stick [DVB-T]
    b803  Lifeview LV5TDLX DVB-T [RTL2832U]
+	c803  NotOnlyTV (Lifeview) LV5TDLX DVB-T [RTL2832U]
    d220  Geniatech T220 DVB-T2 TV Stick
+1f52  Systems & Electronic Development FZCO (SEDCO)
+	0001  Ultima 49 Printer
+	0002  Ultima 90 Printer
+	0003  FormsPro 50 Printer
+	0004  Ultima 90+ Printer
 1f6f  Aliph
    0023  Jawbone Jambox
    8000  Jawbone Jambox - Updating
 1f75  Innostor Technology Corporation
+	0611  IS611 SATA/PATA Bridge Controller
+	0621  IS621 SATA Storage Controller
    0888  IS888 SATA Storage Controller
    0902  IS902 UFD controller
+	0916  IS916 Flash Drive
+	0917  IS917 Mass storage
+	0918  IS918 Flash Drive
 1f82  TANDBERG
    0001  PrecisionHD Camera
 1f84  Alere, Inc.
+	1f7e  Lateral Flow Engine
 1f87  Stantum
    0002  Multi-touch HID Controller
 1f9b  Ubiquiti Networks, Inc.
    0241  AirView2-EXT
+	b0b1  UniFi VoIP Phone
 1fab  Samsung Opto-Electroncs Co., Ltd.
    104d  ES65
+1fac  Franklin Wireless
+	0232  U770 3G/4G Wimax/4G LTE Modem
+1fae  Lumidigm
+	0040  M311 Fingerprint Scanner
+	212c  M30x (Mercury) fingerprint sensor
+1fb2  Withings
+	0001  Wi-Fi Body Scale (WBS01)
+1fba  DERMALOG Identification Systems GmbH
 1fbd  Delphin Technology AG
    0001  Expert Key - Data aquisition system
 1fc9  NXP Semiconductors
    0003  LPC1343
+	000c  LPC4330FET180 [ARM Cortex M4 + M0] (device firmware upgrade mode)
+	0082  LPC4330FET180 [ARM Cortex M4 + M0] (mass storage controller mode)
    010b  PR533
+	0126  i.MX 7ULP SystemOnChip in RecoveryMode
    012b  i.MX 8M Dual/8M QuadLite/8M Quad Serial Downloader
+	5002  PTN5002 [Startech VGA/DVI-D adapter]
+	8124  SharkRF Bootloader
+	824c  LumiNode1
 1fde  ILX Lightwave Corporation
    0001  UART Bridge
 1fe7  Vertex Wireless Co., Ltd.
@@ -18834,19 +20638,37 @@
 1ff7  CVT Electronics.Co.,Ltd
    0013  CVTouch Screen (HID)
    001a  Human Interface Device
+1ffb  Pololu Corporation
+	0081  AVR Programmer
+	0083  Jrk 21v3 Motor Controller
+	0089  Micro Maestro 6-Servo Controller
+	008a  Mini Maestro 12-Channel Servo Controller
+	008b  Mini Maestro 18-Channel Servo Controller
+	008c  Mini Maestro 24-Channel Servo Controller
+	00b0  AVR Programmer v2
 1fff  Ideofy Inc.
+2000  CMX Systems
+	1f0c  HP StreamSmart 410 [NW278AA]
 2001  D-Link Corp.
    0001  DWL-120 WIRELESS ADAPTER
    0201  DHN-120 10Mb Home Phoneline Adapter
    1a00  DUB-E100 Fast Ethernet Adapter(rev.A) [ASIX AX88172]
    1a02  DUB-E100 Fast Ethernet Adapter(rev.C1) [ASIX AX88772]
    200c  10/100 Ethernet
+	3101  DWA-182 AC1200 DB Wireless Adapter(rev.A1) [Broadcom BCM43526]
    3200  DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
    3301  DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
    3306  DWL-G122 Wireless Adapter(rev.F1) [Realtek RTL8188SU]
    3308  DWA-121 802.11n Wireless N 150 Pico Adapter [Realtek RTL8188CUS]
    3309  DWA-135 802.11n Wireless N Adapter(rev.A1) [Realtek RTL8192CU]
    330a  DWA-133 802.11n Wireless N Adapter [Realtek RTL8192CU]
+	330d  DWA-131 802.11n Wireless N Nano Adapter (rev.B1) [Realtek RTL8192CU]
+	330f  DWA-125 Wireless N 150 Adapter(rev.D1) [Realtek RTL8188ETV]
+	3310  DWA-123 Wireless N 150 Adapter (rev.D1)
+	3314  DWA-171 AC600 DB Wireless Adapter(rev.A1) [Realtek RTL8811AU]
+	3315  DWA-182 Wireless AC Dualband Adapter(rev.C) [Realtek RTL8812AU]
+	3317  DWA-137 Wireless N High-Gain Adapter [Ralink RT5372]
+	3319  DWA-131 Wireless N Nano Adapter (Rev. E1) [Realtek RTL8192EU]
    3500  Elitegroup Computer Systems WLAN card WL-162
    3700  DWL-122 802.11b [Intersil Prism 3]
    3701  DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
@@ -18876,12 +20698,14 @@
    3c19  DWA-125 Wireless N 150 Adapter(rev.A3) [Ralink RT5370]
    3c1a  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.B2) [Ralink RT5572]
    3c1b  DWA-127 Wireless N 150 High-Gain Adapter(rev.A1) [Ralink RT3070]
+	3c1e  DWA-125 Wireless N 150 Adapter(rev.B1) [Ralink RT5370]
    4000  DSB-650C Ethernet [klsi]
    4001  DSB-650TX Ethernet [pegasus]
    4002  DSB-650TX Ethernet [pegasus]
    4003  DSB-650TX-PNA Ethernet [pegasus]
    400b  10/100 Ethernet
    4102  10/100 Ethernet
+	4a00  DUB-1312 Gigabit Ethernet Adapter
    5100  DSL-200 ADSL ATM Modem
    5102  DSL-200 ADSL Loader
    5b00  Remote NDIS Network Device
@@ -18900,13 +20724,28 @@
 2002  DAP Technologies
 2003  detectomat
    ea61  dc3500
+2006  LenovoMobile
+2009  iStorage
+	5004  datAshur 4GB
+	5016  datAshur 16GB
+	5032  datAshur 32GB
 200c  Reloop
    100b  Play audio soundcard
 2013  PCTV Systems
+	0242  QuatroStick 510e
    0245  PCTV 73ESE
    0246  PCTV 74E
    0248  PCTV 282E
+	024c  DVB-S2 Stick 460e
    024f  nanoStick T2 290e
+	0251  QuatroStick nano 520e
+	0258  DVB-S2 Stick 461e
+	025a  AndroiDTV 78e
+	025f  tripleStick 292e
+	0262  microStick 79e
+2018  Deutsche Telekom AG
+	0406  Eumex 800
+	0408  Eumex 800
 2019  PLANEX
    3220  GW-US11S WLAN [Atmel AT76C503A]
    4901  GW-USSuper300 802.11bgn Wireless Adapter [Realtek RTL8191SU]
@@ -18932,11 +20771,17 @@
    ed16  GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU]
    ed17  GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]
    ed18  GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU]
+201e  Haier
+	2009  CE100 CDMA EVDO
+203a  PARALLELS
 203d  Encore Electronics Inc.
    1480  ENUWI-N3 [802.11n Wireless N150 Adapter]
 2040  Hauppauge
+	0265  WinTV-dualHD DVB
+	026d  WinTV-dualHD ATSC
    0c80  Windham
    0c90  Windham
+	1605  WinTV-HVR 930C HD
    1700  CataMount
    1800  Okemo A
    1801  Okemo B
@@ -18947,6 +20792,7 @@
    2011  WinTV MiniCard [Dell Digital TV Receiver]
    2019  Tiger Minicard
    2400  WinTV PVR USB2 (Model 24019)
+	4200  WinTV
    4700  WinTV Nova-S-USB2
    4902  HD PVR
    4903  HS PVR
@@ -18960,7 +20806,8 @@
    6500  WinTV HVR-900
    6502  WinTV HVR-900
    6503  WinTV HVR-930
-	6513  WinTV HVR-980
+	6513  WinTV HVR-950/HVR-980
+	6600  WinTV HVR-900H (Model 660xx)
    7050  Nova-T Stick
    7060  Nova-T Stick 2
    7070  Nova-T Stick 3
@@ -18970,15 +20817,71 @@
    9301  WinTV NOVA-T USB2 (warm)
    9941  WinTV Nova-T-500
    9950  WinTV Nova-T-500
+	b123  WinTV-HVR-955Q
+	b138  WinTV-HVR-900 model 00246 [WinTV-T Video]
    b910  Windham
    b980  Windham
    b990  Windham
    c000  Windham
    c010  Windham
 2047  Texas Instruments
-	0200  MSP430 USB HID Bootstrap Loader
+	0013  MSP eZ-FET lite
+	0014  MSP-FET
+	0200  MSP430 Bootloader
+	0203  eZ-FET Bootloader
+	0204  MSP-FET Bootloader
+	0300  MSP430 CDC Example
+	0301  MSP430 HID Datapipe Example
+	0302  MSP430 CDC+HID Example
+	0309  MSP430 HID Mouse Example
+	0313  MSP430 CDC+CDC Example
+	0314  MSP430 HID+HID Example
+	0315  MSP430 HID Keyboard Example
+	0316  MSP430 MSC File System Emulation Example
+	0317  MSP430 MSC SD Card Example
+	0318  MSP430 MSC Multiple LUNs Example
+	0319  MSP430 MSC+CDC+HID Example
+	0320  MSP430 SYSBIOS Tasks MSC+CDC+HID Example
+	0321  MSP430 SYSBIOS SWIs MSC+CDC+HID Example
+	0322  MSP430 MSC Double-Buffering Example
+	0323  MSP430 MSC CD-ROM Example
+	03df  MSP430 User Experiment
+	03e0  MSP430 User Experiment
+	03e1  MSP430 User Experiment
+	03e2  MSP430 User Experiment
+	03e3  MSP430 User Experiment
+	03e4  MSP430 User Experiment
+	03e5  MSP430 User Experiment
+	03e6  MSP430 User Experiment
+	03e7  MSP430 User Experiment
+	03e8  MSP430 User Experiment
+	03e9  MSP430 User Experiment
+	03ea  MSP430 User Experiment
+	03eb  MSP430 User Experiment
+	03ec  MSP430 User Experiment
+	03ed  MSP430 User Experiment
+	03ee  MSP430 User Experiment
+	03ef  MSP430 User Experiment
+	03f0  MSP430 User Experiment
+	03f1  MSP430 User Experiment
+	03f2  MSP430 User Experiment
+	03f3  MSP430 User Experiment
+	03f4  MSP430 User Experiment
+	03f5  MSP430 User Experiment
+	03f6  MSP430 User Experiment
+	03f7  MSP430 User Experiment
+	03f8  MSP430 User Experiment
+	03f9  MSP430 User Experiment
+	03fa  MSP430 User Experiment
+	03fb  MSP430 User Experiment
+	03fc  MSP430 User Experiment
+	03fd  MSP430 User Experiment
+	0401  MSP430 Keyboard Example
    0855  Invensense Embedded MotionApp HID Sensor
+	08f8  FDC2x14/LDC13xx/LDC16xx EVM
    0964  Inventio Software MSP430
+	0a76  GEOKON S-3810A-5 USB-RS485 CONVERTER
+	ffe7  HID v1.00 Device [Improv Device]
 2058  Nano River Technology
    2058  ViperBoard I2C, SPI, GPIO interface
 2077  Taicang T&W Electronics Co. Ltd
@@ -18988,17 +20891,29 @@
    0002  NOOKcolor
    0003  NOOK Simple Touch
    0004  NOOK Tablet
+	0005  BNTV600 [Nook HD+]
+	0006  BNTV400 [Nook HD]
+	0007  BNRV500 [Nook Glowlight]
+	000a  BNRV510 [Nook Glowlight Plus]
+	000b  BNRV520 [Nook Glowlight 3]
+	000c  BNRV700 [Nook Glowlight Plus]
 2086  SIMPASS
 2087  Cando
    0a01  Multi Touch Panel
    0a02  Multi Touch Panel
    0b03  Multi Touch Panel
 20a0  Clay Logic
+	0006  flirc
+	4107  GPF Crypto Stick V1.2
    4123  IKALOGIC SCANALOGIC 2
    414a  MDE SPI Interface
    415a  OpenPilot
    415b  CopterControl
    415c  PipXtreme
+	41e5  BlinkStick
+	4211  Nitrokey Start
+	4223  ATSAMD21 [castAR]
+	428d  Electrosense wideband converter
 20b1  XMOS Ltd
    10ad  XUSB Loader
    f7d1  XTAG2 - JTAG Adapter
@@ -19009,18 +20924,28 @@
    1540  ben-wpan, AT86RF230-based
    1db5  IDBG in DFU mode
    1db6  IDBG in normal mode
+	9db1  Glasgow Debug Tool
    c25b  C2 Dongle
    cb72  ben-wpan, cntr
+20bc  ShenZhen ShanWan Technology Co., Ltd.
+	5500  Frostbite controller
 20ce  Minicircuits
    0012  RF Sythesizer 250-4200MHz model SSG-4000LH
    0021  RF Switch Matrix
    0022  I/O Controller
 20df  Simtec Electronics
    0001  Entropy Key [UDEKEY01]
+20f0  L3Harris Technologies
+	2102  EWLA V2 Module
 20f1  NET New Electronic Technology GmbH
    0101  iCube3 Camera
 20f4  TRENDnet
+	646b  TEW-646UBH High Power 150Mbps Wireless N Adapter [Realtek RTL8188SU]
    648b  TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
+	664b  TEW-664UB H/W:V2.0R
+	804b  TEW-804UB 802.11a/b/g/n/ac (1x1) Wireless Adapter [Realtek RTL8811AU]
+	805b  TEW-805UB 300Mbps+867Mbps Wireless AC Adapter [Realtek RTL8812AU]
+	806b  TEW-806UBH 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U]
 20f7  XIMEA
    3001  MQ or MD camera
    3002  MU camera
@@ -19028,40 +20953,106 @@
    30b3  MQ in U3V mode or MC camera
    a003  MU camera
 2100  RT Systems
+	0e56  USB62C Radio Cable [Yaesu 857/D - 897/D]
+	9e50  USB-59 Radio Cable [Yaesu VX-8/D/DR]
    9e52  Yaesu VX-7
    9e54  CT29B Radio Cable
    9e57  RTS01 Radio Cable
+	9e58  USB63C Radio Cable [Yaesu FTDX-1200]
    9e5d  K4Y Radio Cable
    9e5f  FT232RL [RTS05 Serial Cable]
 2101  ActionStar
    0201  SIIG 4-to-2 Printer Switch
+	1402  Keyboard/Mouse Switch
+2104  Tobii Technology AB
+	0050  Eye tracker [EYEX2]
+	0124  Eyechip
+2107  RDING TECH CO.,LTD
 2109  VIA Labs, Inc.
+	0210  Hub
    0700  VL700 SATA 3Gb/s bridge
    0701  VL701 SATA 3Gb/s bridge
+	0711  VL711 SATA 6Gb/s bridge
+	0715  VL817 SATA Adaptor
    0810  VL81x Hub
    0811  Hub
    0812  VL812 Hub
+	0813  VL813 Hub
+	0820  VL820 Hub
+	2210  Hub
    2811  Hub
    2812  VL812 Hub
+	2813  VL813 Hub
+	2820  VL820 Hub
    3431  Hub
+	711f  External
    8110  Hub
 2113  Softkinetic
    0137  DepthSense 311 (3D)
    0145  DepthSense 325
    8000  DepthSense 311 (Color)
+2116  KT Tech
+	000a  IDE Hard Drive Enclosure
+211f  CELOT Corporation
+	6801  CDMA Products
+2123  Cheeky Dream
+	1010  Rocket Launcher
+2125  Fiberpro Inc.
+	0000  Bootloader
+	0010  MCB-100 Series
+2133  signotec GmbH
+	0001  LCD Signature Pad Sigma
+	0018  Delta Pen
+	0019  Delta Touch
+	001c  Kronos Pen
+	0022  Epsilon Pen
 2149  Advanced Silicon S.A.
    211b  Touchscreen Controller
+	2306  TS58xxA/TC56xxA [CoolTouch]
    2703  TS58xxA/TC56xxA [CoolTouch]
-2162  Creative (?)
+214b  Huasheng Electronics
+	7000  4-port hub [Maxxter ACT-HUB2-4P, HS8836, iSoul ultra-slim]
+214e  Swiftpoint
+	0005  Z - Gaming mouse [SM700]
+2162  Broadxent (Creative Labs)
    2031  Network Blaster Wireless Adapter
    500c  DE5771 Modem Blaster
    8001  Broadxent BritePort DSL Bridge 8010U
+2166  JVC Kenwood
+	600b  TH-D74
 2184  GW Instek
    0005  GDS-3000 Oscilloscope
    0006  GDS-3000 Oscilloscope
    0011  AFG Function Generator (CDC)
+	0017  DSO
+	0018  DSO
+	0036  AFG-125 Function Generator (CDC)
+2188  No brand
+	0610  Hub
+	0611  Hub
+	0620  Hub
+	0625  Hub
+	0754  Card Reader
+	4042  CalDigit Pro Audio
+219c  Seal One AG
+	0010  USB 2200 K Secure Sign Token
 21a1  Emotiv Systems Pty. Ltd.
    0001  EPOC Consumer Headset Wireless Dongle
+21a4  Electronic Arts Inc.
+	ac27  SPORTS Active 2 Wireless Controller for PS3
+	ac40  SPORTS Active 2 Wireless Controller for Wii
+21a9  Saleae, Inc.
+	1001  16-channel Logic Analyzer [Logic16]
+	1003  Logic 4
+	1004  Logic8
+	1005  Logic Pro 8
+	1006  Logic Pro 16
+21ab  Planeta Informatica
+	0010  RC700 NFC SmartCard Reader
+	0011  DSR700 SmartCard Reader
+21b4  AudioQuest
+	0081  DragonFly
+	0082  DragonFly Red
 21d6  Agecodagis SARL
    0002  Seismic recorder [Tellus]
 2207  Fuzhou Rockchip Electronics Company
@@ -19083,21 +21074,38 @@
    320c  RK3328 in Mask ROM mode
    330a  RK3368 in Mask ROM mode
    330c  RK3399 in Mask ROM mode
+221a  ZTEX GmbH
+	0100  FPGA Boards
 2222  MacAlly
    0004  iWebKey Keyboard
+	0005  ICEKey Keyboard
+	1001  Generic Hub
    2520  Mini Tablet
    4050  AirStick joystick
+2226  Copper Mountain technologies
 2227  SAMWOO Enterprise
    3105  SKYDATA SKD-U100
+222a  ILI Technology Corp.
+	0001  Multi-Touch Screen
+	0037  Multi-Touch Screen
+2230  Plugable
+	0001  UD-160-A / M Integrated Hub
+	0003  DC-125 / M Integrated Hub
 2232  Silicon Motion
    1005  WebCam SCB-0385N
+	1024  Webcam SC-13HDL11624N [Namuga Co., Ltd.]
    1028  WebCam SC-03FFL11939N
    1029  WebCam SC-13HDL11939N
    1037  WebCam SC-03FFM12339N
+	1045  WebCam SC-10HDP12631N
 2233  RadioShack Corporation
    6323  USB Electronic Scale
 2237  Kobo Inc.
    4161  eReader White
+	4163  Touch
+	4173  Glo
+2245  Aspeed Technology, Inc.
+	1500  AST1500/1510 PC-over-LAN Virtual Hub
 224f  APDM
    0001  Access Point
    0002  Docking Station
@@ -19106,23 +21114,43 @@
    0006  V2 Docking Station
    0007  V2 Access Point ACM
    0008  V2 Access Point
+2256  Faderfox
+	1007  LV3 MIDI Controller
 225d  Morpho
    0001  FINGER VP Multimodal Biometric Sensor
    0008  CBM-E3 Fingerprint Sensor
-	0009  CBM Fingerprint Sensor [CBM-V3]
+	0009  CBM-V3 Fingerprint Sensor
    000a  MSO1300-E3 Fingerprint Sensor
-	000b  MSO1300 Fingerprint Sensor [MSO1300-V3]
+	000b  MSO1300-V3 Fingerprint Sensor
    000c  MSO1350-E3 Fingerprint Sensor & SmartCard Reader
-	000d  MSO1350 Fingerprint Sensor & SmartCard Reader [MSO1350-V3]
+	000d  MSO1350-V3 Fingerprint Sensor & SmartCard Reader
    000e  MorphoAccess SIGMA Biometric Access Control Terminal
+	9015  Tablet 2
+	9024  Tablet 2
+	9039  Tablet 2 secure multifunction biometric tablet
+	904d  Tablet 2 secure multifunction biometric tablet
+	904e  Tablet 2 secure multifunction biometric tablet
+	9091  Tablet 2 secure multifunction biometric tablet
+	9092  Tablet 2 secure multifunction biometric tablet
+	f000  Tablet 2 secure multifunction biometric tablet
+	f003  Tablet 2 secure multifunction biometric tablet
+	f006  Tablet 2 secure multifunction biometric tablet
+	f00e  Tablet 2 secure multifunction biometric tablet
+226e  DISPLAX
 228d  8D Technologies inc.
    0001  Terminal Bike Key Reader
+22a4  VERZO Technology
 22a6  Pie Digital, Inc.
    ffff  PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB)
+22a7  Fortinet Technologies
+	1001  FortiGate Device
+22b1  Secret Labs LLC
+	1000  Netduino MCU pcb
 22b8  Motorola PCS
    0001  Wally 2.2 chipset
    0002  Wally 2.4 chipset
    0005  V.60c/V.60i GSM Phone
+	002e  XT1806
    0830  2386C-HT820
    0833  2386C-HT820 [Flash Mode]
    0850  Bluetooth Device
@@ -19153,6 +21181,8 @@
    2ac1  MSM6100 chipset
    2ac3  MSM6100 chipset flash
    2d78  XT300[SPICE]
+	2e82  XT1541 [Moto G 3rd Gen]
+	2e83  XT1033 [Moto G], PTP mode
    3001  A835/E1000 GSM Phone (P2K)
    3002  A835/E1000 GSM Phone (AT)
    3801  C350L/C450 (P2K)
@@ -19172,6 +21202,7 @@
    4234  MPc CDMA
    4244  MPx100 Smartphone
    4285  Droid X (Mass storage)
+	42d9  XT910 [Droid RAZR]
    4801  Neptune LTS chipset
    4803  Neptune LTS chipset flash
    4810  Triplet GSM Phone (storage)
@@ -19202,17 +21233,65 @@
    6101  Talon integrated chipset
    6401  Argon chipset
    6403  Argon chipset flash
+	6411  ROKR Z6 (print mode)
    6415  ROKR Z6 (MTP mode)
+	6422  ROKR Z6 (modem mode)
+	6426  ROKR Z6 (storage mode)
    6604  Washington CDMA Phone
    6631  CDC Modem
    7001  Q Smartphone
+	7086  Atrix
+	70a8  Xoom Tablet
    fe01  StarTAC III MS900
 22b9  eTurboTouch Technology, Inc.
    0006  Touch Screen
 22ba  Technology Innovation Holdings, Ltd
+	0108  Double Shock Steering Wheel HID
+	0109  Double Shock Steering Wheel Hub
+22c9  StepOver GmbH
+	0601  naturaSign Pad Colour
+	0701  naturaSign Pad Mobile
+	0801  naturaSign Pad Comfort
+	0881  naturaSign Pad Flawless
+	0901  naturaSign Pad Classic
+	09e1  naturaSign Pad Biometric
+	0ce1  duraSign Pad Brilliance
+	0cf1  duraSign Pad Biometric 5.0
+	0d01  duraSign 10.0
+	0df1  duraSign Pad Biometric 10.0
+22cd  Kinova Robotics Inc.
+22d4  Laview Technology
+	1301  Mionix NAOS 8200 [STM32F103 MCU]
+	1308  Mionix Avior 7000
+	130c  Mionix Naos 7000
+	1316  Mionix Castor
+22d9  OPPO Electronics Corp.
+	2765  Oppo N1
+	2767  Oppo Find 5 (X909)
+22db  Phase One
+	0003  IQ3 100MP IG030372
+22dc  Mellanox Technologies
+	0004  BlueField SOC
+22de  WeTelecom Incorporated
+22df  Medicom MTD, Ltd
 22e0  secunet Security Networks AG
    0002  SINA Flash Drive
    0003  SINA ID Token A
+22e8  Cambridge Audio
+	6512  651N Audio
+	6969  Audio Prototype
+	7512  751R Audio
+	770a  X70A Audio
+	850c  851C Audio [Azur 850C]
+	851d  851D Audio [Azur 851D]
+	ca02  Audio
+	ca04  Audio
+	ca06  AmpMagic
+	dac2  DacMagic Plus
+	dac3  Azur DacMagic 100
+	dac4  Azur DacMagic 100
+	dac6  DacMagicXS 2.0
+	dac8  Audio
 2304  Pinnacle Systems, Inc.
    0109  Studio PCTV USB (SECAM)
    0110  Studio PCTV USB (PAL)
@@ -19259,63 +21338,346 @@
    0419  PCTV Bungee USB (PAL) with FM radio
    061d  PCTV Deluxe (NTSC) Device
    061e  PCTV Deluxe (PAL) Device
+	2304  1689
+230d  Teracom
+	0103  Huwaii 3g wireless modem
+2314  INQ Mobile
 2318  Shining Technologies, Inc. [hex]
    0011  CitiDISK Jr. IDE Enclosure
+2319  Tronsmart
+	0014  TSM01 Air Mouse + Keyboard
+232b  Pantum Ltd.
+	0810  P2000
+232e  EA Elektro-Automatik GmbH & Co. KG
+	0010  EA-PS-2000 B Series Power Supply
+2340  Teleepoch
 2341  Arduino SA
    0001  Uno (CDC ACM)
    0010  Mega 2560 (CDC ACM)
+	0036  Leonardo Bootloader
    003b  Serial Adapter (CDC ACM)
+	003d  Due Programming Port
+	003e  Due
    003f  Mega ADK (CDC ACM)
    0042  Mega 2560 R3 (CDC ACM)
    0043  Uno R3 (CDC ACM)
    0044  Mega ADK R3 (CDC ACM)
    0045  Serial R3 (CDC ACM)
+	0049  ISP
    8036  Leonardo (CDC ACM, HID)
+	8038  Robot Control Board (CDC ACM, HID)
+	8039  Robot Motor Board (CDC ACM, HID)
+2349  P2 Engineering Group, LLC
+234b  Free Software Initiative of Japan
+	0000  Gnuk Token
+	0001  NeuG True RNG
 2357  TP-Link
+	0005  M7350 4G Mi-Fi Router
    0100  TL-WN8200ND [Realtek RTL8192CU]
    0101  RTL8812AU Archer T4U 802.11ac
    0103  Archer T4UH wireless Realtek 8812AU
    0105  Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U]
    0106  Archer T9UH v1 [Realtek RTL8814AU]
-	0107  TL-WN821N Version 5 RTL8192EU
+	0107  TL-WN821N v5/v6 [RTL8192EU]
    0108  TL-WN822N Version 4 RTL8192EU
-	0109  TL WN823N RTL8192EU
-	010c  TL-WN722N v2
-	010e  TL-WN722N v2
+	0109  TL-WN823N v2/v3 [Realtek RTL8192EU]
+	010b  Archer T2UHP [MediaTek MT7610U]
+	010c  TL-WN722N v2/v3 [Realtek RTL8188EUS]
+	010d  Archer T4U v2 [Realtek RTL8812AU]
+	010e  Archer T4UH v2 [Realtek RTL8812AU]
+	010f  Archer T4UHP [Realtek RTL8812AU]
+	0115  Archer T4U ver.3
+	011e  AC600 wireless Realtek RTL8811AU [Archer T2U Nano]
+	0120  Archer T2U PLUS [RTL8821AU]
+	012d  Archer T3U [Realtek RTL8812BU]
    0200  MA 180 Zero CD
    0201  HSUPA Modem MA180
+	0600  UE300 10/100/1000 LAN (mass storage CD-ROM mode) [Realtek RTL8153]
+	0601  UE300 10/100/1000 LAN (ethernet mode) [Realtek RTL8153]
+2366  Bitmanufaktur GmbH
+	0001  Reserved Prototyping PID
+	0002  OpenBeacon USB 2
+	0003  OpenPCD 2 RFID Reader for 13.56MHz
+	0004  OpenBeacon
+	0005  Blinkenlights WDIM
+	0006  Blinkenlights WMCU
+	0007  OpenBeacon Ethernet EasyReader PoE II - Active 2.4GHz RFID Reader
+	0008  OpenBeacon WLAN
+	0009  OpenPCD 2 RFID Reader for 13.56MHz
+	000a  OpenPCD 2 Audio & LCD Display
+2367  Teenage Engineering
+	0002  OP-1 Portable synthesizer
+	000c  OP-Z Portable synthesizer
+2368  Peterson Electro-Musical Products Inc.
+	0001  BBS-1 [BodyBeat Sync]
+236a  SiBEAM
+	1965  SB6501 802.11ad Wireless Network Adapter
 2373  Pumatronix Ltda
    0001  5 MegaPixel Digital Still Camera [DSC5M]
 2375  Digit@lway, Inc.
    0001  Digital Audio Player
+2378  OnLive
+	100a  Universal Wireless Controller
+237d  Cradlepoint
+	0400  MC400
+2386  Raydium Corporation
+	3125  Touch System
+	4328  Touch System
+	432f  Touch System
+238b  Hytera Communications
+	0a11  DMR Radio
+239a  Adafruit
+	0001  CDC Bootloader
+	801e  Trinket M0
+23a0  BIFIT
+	0001  Token iBank2key
+	0002  iBank2Key Type M Token
+	0003  iToken
+	0008  MS_KEY K - Angara
+23a6  Tronical Components GmbH
+	2000  Gibson Firebird X Pedal Board
+	2001  Gibson Firebird X Switch Board
+23b4  Dental Wings Inc.
+	0200  DW0200 Color Camera
+	0300  DW0300 Hight Speed Monochrome Camera
+23c7  Gemini
+	1021  FirstMix
+23fc  SesKion GmbH
+	0201  SPI-Simulyzer box for SPI data communication
+	0202  PSI5-Simulyzer box for PSI5 (Peripheral-Sensor-Interfacs) data communication
+	0203  SENT-Simulyzer box for SENT data communication
+	0204  DSI-Simulyzer box for DSI3 data communication
+2405  Custom Computer Services, Inc
+	0002  West Mountain Radio RIGblaster Advantage Audio
+	0003  West Mountain Radio RIGblaster Advantage
 2406  SANHO Digital Electronics Co., Ltd.
    6688  PD7X Portable Storage
+2420  IRiver
+242e  Vossloh-Schwabe Deutschland GmbH
+	0001  DALI Master
+	0002  LiCS Bootloader Mode
+	0003  LiCS Running Mode
+	0004  iProgrammer
+	0005  NFC programming device
+2433  ASETEK
+	b200  [NZXT Kraken X60]
 2443  Aessent Technology Ltd
    00dc  aes220 FPGA Mini-Module
+2457  Ocean Optics Inc.
+	100a  HR2000 Spectrometer 1.00.0
+	1012  HR4000 Spectrometer
+2458  Bluegiga Technologies
+	0001  BLED112 Bluetooth 4.0 Single Mode Dongle
+245f  Chord Electronics Limited
+2464  Nest
+	0001  Learning Thermostat
+	0002  Learning Thermostat (2nd Generation)
+	0010  Protect : Smoke + Carbon Monoxide
+	0020  Heat Link
+2466  Fractal Audio Systems
+	8003  Axe-Fx II
+	8010  Axe-FX III
+2476  YEI Technology
+	1040  3-Space Embedded Sensor
 2478  Tripp-Lite
    2008  U209-000-R Serial Port
 248a  Maxxter
    8366  Wireless Optical Mouse ACT-MUSW-002
+	8367  Telink Wireless Receiver
 249c  M2Tech s.r.l.
+24a4  Primare AB
+	0002  I15_v1.06 [Primare Audio DAC]
+24ae  Shenzhen Rapoo Technology Co., Ltd.
+	0001  KX Keyboard
+	0197  meva Barcode Scanner
+	1813  E9260 Wireless Multi-mode Keyboard
+	2000  2.4G Wireless Device Serial
+	2001  5 GHz Wireless Receiver
+	2003  5GHz Wireless Transceiver
+	4110  Optical Gaming Mouse [V280]
+	6000  Wireless Audio
+24c0  Chaney Instrument
+	0003  Model 01036 weather center
+24c6  ThrustMaster, Inc.
+	5000  Razer Atrox Gaming Arcade Stick
+	5300  PowerA Mini ProEX Controller for Xbox 360
+	5303  Airflo Wired Controller for Xbox 360
+	530a  ProEX Controller for Xbox 360
+	531a  Pro Ex mini for XBOX
+	5397  FUS1ON Tournament Controller
+	541a  PowerA CPFA115320-01 [Mini Controller for Xbox One]
+	542a  Spectra for Xbox One
+	543a  PowerA Wired Controller for Xbox One
+	5500  Horipad EX2 Turbo
+	5501  Hori Real Arcade Pro.VX-SA for Xbox 360
+	5502  Hori Fighting Stick VX Alt for Xbox 360
+	5503  Hori Fighting Edge for Xbox 360
+	5506  Hori Soulcalibur V Stick for Xbox 360
+	550d  Hori Gem Controller for Xbox 360
+	550e  Real Arcade Pro V Kai for Xbox One / Xbox 360
+	551a  Fusion Pro Controller
+	561a  Fusion Controller for Xbox One
+	5b00  Ferrari 458 Italia Racing Wheel
+	5b02  GPX Controller
+	5d04  Sabertooth Elite
+	fa00  INF-8032385 Disney Infinity Reader
+	fafb  Aplay Controller
+	fafd  Afterglow Gamepad for Xbox 360
+	fafe  Rock Candy Gamepad for Xbox 360
+24cf  Lytro, Inc.
+	00a1  Light Field Camera
+24dc  Aladdin R.D.
+	0406  JaCarta SF GOST
+24e0  Yoctopuce Sarl
 24e1  Paratronic
    3001  Adp-usb
    3005  Radius
+24e3  K-Touch
+24ea  Meva
+	0197  Barcode Scanner
+24ed  Zen Group
+	044d  Chat Headset
+24f0  Metadot
+	0105  Das Keyboard 4
+	0140  Das Keyboard 4
+	2020  Das Keyboard 5Q
+24ff  Acroname Inc.
+2500  Ettus Research LLC
+	0020  USRP B210
+	0021  USRP B200-mini
+	0022  USRP B205-mini
+	0200  USRP B200
 2516  Cooler Master Co., Ltd.
    0003  Storm Xornet
    0004  Storm QuickFire Rapid Mechanical Keyboard
    0006  Storm Recon
    0007  Storm Sentinel Advance II
    0009  Storm Quick Fire PRO
-	0011  Storm Quick Fire TK
+	0011  Storm Quick Fire TK 6keys
+	0014  Storm Quick Fire TK Nkeys
+	0015  Storm QuickFire Pro/Ultimate keyboard
    0017  CM Storm Quick Fire Stealth
+	001a  Storm Quick Fire XT
    0020  QuickFire Rapid-i Keyboard
    0027  CM Storm Coolermaster Novatouch TKL
    002d  Alcor mouse
+	0042  Masterkeys Lite L Combo RGB Keyboard
+	0044  Masterkeys Lite L Combo RGB Mouse
+	0046  Masterkeys PRO L
    0047  MasterKeys Pro L
+	0055  MasterKeys L
+	1006  MasterCase SL600M
    9494  Sirus Headset
+2520  ANA-U GmbH
+	0001  EasyPrinter S3
+2527  Software Bisque
+	1388  Paramount 5
+2537  Norelsys
+	1066  NS1066
+	1068  NS1068/NS1068X SATA Bridge Controller
+2544  Energy Micro AS
+2546  Ravensburger
+	e301  TipToi Pen
 2548  Pulse-Eight
    1001  CEC Adapter
    1002  CEC Adapter
+254e  SHF Communication Technologies AG
+	e2b3  SHF 58035 A BiasBoard
+2554  ASSA ABLOY AB
+2555  Basis Science Inc.
+	0001  B1 Fitness Band
+255e  Beijing Bonxeon Technology Co., Ltd.
+	0001  Device
+	0002  Dual
+2560  e-con Systems
+	c152  See3CAM_CU51 5 Mpx monochrome camera
+2563  ShenZhen ShanWan Technology Co., Ltd.
+	031d  DXT Mouse
+	0523  BM0523 WirelessGamepad
+	0575  ZD-V+ Wired Gaming Controller
+256b  Perreaux Industries Ltd
+	0121  Audiant 80i
+256f  3Dconnexion
+	c62e  SpaceMouse Wireless (cabled)
+	c62f  SpaceMouse Wireless Receiver
+	c631  SpaceMouse Pro Wireless (cabled)
+	c632  SpaceMouse Pro Wireless Receiver
+	c633  SpaceMouse Enterprise
+	c635  SpaceMouse Compact
+	c651  CadMouse Wireless
+	c652  Universal Receiver
+	c654  CadMouse Pro Wireless
+	c657  CadMouse Pro Wireless Left
+2573  ESI Audiotechnik GmbH
+	0017  MAYA22
+2574  AVer Information, Inc.
+	0901  VC520
+	0910  CAM520
+	0920  VC320
+	0930  CAM530
+	0940  CAM340
+	0950  VC322
+	0960  VB342
+2575  Weida Hi-Tech Co., Ltd.
+2576  AFO Co., Ltd.
+	0003  TCM
+	0005  BL [Boot Loader]
+	0011  THM
+2578  Pluscom
+	4168  2.4GHZ Wireless Arc Folding Mouse
+2581  Plug-up
+	1807  Generic HID Smartcard
+	1808  WinUSB Smartcard
+	f1d0  FIDO U2F Security Key
+258d  Sequans Communications
+259a  TriQuint Semiconductor
+25a7  Areson Technology Corp
+	2410  Laser mouse
+	fa23  2.4G Receiver
+	fa61  Elecom Co., Ltd MR-K013 Multicard Reader
+25b5  FlatFrog
+	0002  Multitouch 3200
+25bb  Brunner Elektronik AG
+	0063  PRT.5105 [Yoke]
+	0064  PRT.5105 [reserved]
+	0065  PRT.5096 [Battery Management System]
+	0066  PRT.5096 [Battery Management System]
+	0067  PRT.5094
+	0068  PRT.5094
+	0069  PRT.5119 [Ethernet2CAN LC Gateway]
+	006a  PRT.5113 [CLS CANaerospace Gateway]
+	006b  PRT.5123
+	006c  PRT.5123 [reserved]
+	006d  PRT.5127
+	00ff  MSP430 HID Update Agent
+25bf  Elegant Invention
+	0001  Isostick
+	0002  Isostick updater
+25c4  ARCAM
+25c6  Vitus Audio (AVA Group A/S)
+25c8  Visual Planet Ltd
+	0014  Single User touchfoil(tm) (SU2-80)
+25da  Netatmo
+	0001  Weather Station
+25e3  Lumigon
+25f0  ShanWan
+	c131  Gioteck PS3 2.4G Wireless Controller
+25fb  Pentax Ricoh Imaging Co., Ltd
+	0102  K-5
+2604  Tenda
+	0012  U12
+2625  MilDef AB
+2626  Aruba Networks
+	ea60  UART Bridge Controller [cp210x]
+262a  SAVITECH Corp.
+	100e  SA9027 Audio Streaming Controller
+	10e0  SA9023 Audio Streaming Controller
+	9020  SA9020 audio controller
+	9023  SA9023 audio controller
+	9027  SA9027 audio controller
+	9226  SA9226 192KHz audio controller
+	9227  SA9227 384KHz audio controller
+	9228  SA9228 384KHz/DSD audio controller
 2632  TwinMOS
    3209  7-in-1 Card Reader
 2639  Xsens
@@ -19331,8 +21693,13 @@
    0102  Awinda Dongle
    0103  Sync Station
    0200  MTw
+	0300  Motion Tracker Development Board
+	0301  MTi Converter
    d00d  Wireless Receiver
+264a  Thermaltake
+	1004  Ventus
 2650  Electronics For Imaging, Inc. [hex]
+	1311  eBeam Classic [Luidia]
 2659  Sundtek
    1101  TNT DVB-T/DAB/DAB+/FM
    1201  FM Transmitter/Receiver
@@ -19348,8 +21715,97 @@
    1211  MediaTV Pro III (US)
    1212  MediaTV Pro III MiniPCIe (EU)
    1213  MediaTV Pro III MiniPCIe (US)
+2662  Moog Music Inc.
+266e  Silicon Integrated Systems
+2672  GoPro
+	0004  Hero 3
+	0006  HERO 3+ Silver Edition
+	0007  HERO 3+ Black
+	000e  HERO4 Black
+	0011  Hero 3+ Black
 2676  Basler AG
    ba02  ace
+	ba03  ba03 dart Vision Caera
+	ba04  ba04 pulse Vision Camera
+	ba05  Vision Camera
+	ba06  Vision Camera
+	ba07  Vision Camera
+	ba08  Vision Camera
+	ba09  Vision Camera
+	ba0a  Vision Camera
+	ba0b  Vision Camera
+	ba0c  Vision Camera
+	ba0d  Vision Camera
+	ba0e  Vision Camera
+	ba0f  Vision Camera
+2685  Cardo Peripheral Systems LTD
+	0900  [Packtalk Bold Bluetooth Motorcycle Intercom]
+2687  Fitbit Inc.
+	fb01  Base Station
+2689  StepOver International GmbH
+	0601  naturaSign Pad POS
+	0901  naturaSign Pad Light
+	0ce1  Pad Vivid US
+	0cf1  Pad Biometric US 5.0
+	0d01  duraSign Pad US 10.0
+	0df1  duraSign Pad Biometric US 10.0
+268b  Dimension Engineering
+	0101  DELink 2
+	0201  Sabertooth 2x32
+	0405  Evolv DNA 200
+	0406  Evolv DNA 200
+	0407  Evolv DNA 200
+	0408  Evolv DNA 75
+	0409  Evolv DNA 250
+	0412  Evolv DNA 60
+	0413  Evolv DNA 200
+	0414  Evolv DNA 250
+	0415  Evolv DNA 75
+	0416  Evolv DNA 60
+	0417  Evolv DNA Go
+	0419  Evolv DNA 250 Color
+	0423  Evolv DNA 200
+	0424  Evolv DNA 250
+	0425  Evolv DNA 75
+	0426  Evolv DNA 60
+	8405  Evolv DNA 200 (recovery mode)
+	8406  Evolv DNA 200 (recovery mode)
+	8407  Evolv DNA 200 (recovery mode)
+	8408  Evolv DNA 75 (recovery mode)
+	8409  Evolv DNA 250 (recovery mode)
+	8412  Evolv DNA 60 (recovery mode)
+	8413  Evolv DNA 200 (recovery mode)
+	8414  Evolv DNA 250 (recovery mode)
+	8415  Evolv DNA 75 (recovery mode)
+	8416  Evolv DNA 60 (recovery mode)
+	8423  Evolv DNA 200 (recovery mode)
+	8424  Evolv DNA 250 (recovery mode)
+	8425  Evolv DNA 75 (recovery mode)
+	8426  Evolv DNA 60 (recovery mode)
+26a9  Research Industrial Systems Engineering
+	0001  Payment Terminal v1.0
+26aa  Yaesu Musen
+	0001  FT-1D
+	000e  FTA-550
+	000f  FTA-750
+26b5  Electrocompaniet
+	0002  ECD 2
+	0003  ECD 2 (Audio Class 1)
+	0004  PI 2D
+	0005  PI 2D (Audio Class 1)
+	0006  ECI 6
+	0007  ECI 6 (Audio Class 1)
+	0020  ECI 80
+26bd  Integral Memory
+	9917  Fusion Flash Drive
+26e2  Ingenieurbuero Dietzsch und Thiele, PartG
+26f2  Micromega
+	0200  MyDac
+2707  Bardac Corporation
+	0005  drive.web
+270d  Rosand Technologies
+	1001  R-Idge Bootloader
+	1002  R-Idge Router
 2717  Xiaomi Inc.
    0011  100Mbps Network Card Adapter
    0360  Mi3W
@@ -19365,7 +21821,13 @@
    ff68  Mi-4c
    ff80  Mi/Redmi series (RNDIS)
    ff88  Mi/Redmi series (RNDIS + ADB)
+272a  StarLeaf Ltd.
+272c  Signum Systems
+	7d13  I-jet
 2730  Citizen
+	0fff  CT-S2000/4000/310/CLP-521/621/631/CL-S700 Series
+	1004  PPU-700
+	2002  CT-S2000 Thermal Printer (Parallel mode)
    200f  CT-S310 Label printer
 2735  DigitalWay
    0003  MPIO HS100
@@ -19408,6 +21870,14 @@
    1003  ColorHug+ Bootloader
    1004  ColorHug2
    1005  ColorHug2 bootloader
+2756  Victor Hasselblad AB
+	0002  X1D Camera
+2759  Philip Morris Products S.A.
+	0003  IQOS Pocket Charger 2.4
+2765  Firstbeat Technologies, Ltd.
+	0004  Bodyguard 2
+2766  LifeScan
+	0000  OneTouch Verio
 2770  NHJ, Ltd
    0a01  ScanJet 4600 series
    905c  Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35
@@ -19420,23 +21890,66 @@
    915d  Cyberpix S-210S / Little Tikes My Real Digital Camera
    930b  CCD Webcam(PC370R)
    930c  CCD Webcam(PC370R)
+27a8  Square, Inc.
+	a120  Contactless + Chip Reader
 27b8  ThingM
    01ed  blink(1)
+27bd  Codethink Ltd.
+	0001  Slab Node Manager
+	0002  Slab Node Manager JTAG
+27c0  Cadwell Laboratories, Inc.
+	0818  Paperlike HD-FT
 27c6  Shenzhen Goodix Technology Co.,Ltd.
    5117  Fingerprint Reader
    5201  Fingerprint Reader
    5301  Fingerprint Reader
    530c  Fingerprint Reader
+	532d  Fingerprint
+	5381  Fingerprint Reader
    5385  Fingerprint Reader
    538c  Fingerprint Reader
    5395  Fingerprint Reader
    5584  Fingerprint Reader
    55b4  Fingerprint Reader
    5740  Fingerprint Reader
+27d4  Blackstar Amplification Limited
+27dd  Mindeo
+	0002  Mindeo Virtual COM Port
+27f2  Softnautics LLP
+2803  StarLine LLC.
+	0001  Controller Area Network car alarm module [SLCAN-2]
+2806  SIMPASS
+	0001  N-PASS X1
+2817  Signal Hound, Inc.
+	0002  BB60C Spectrum Analyzer
+	0004  SM200A Spectrum Analyzer
+2818  Codex Digital Limited
+	0001  Transfer Drive Dock
 2821  ASUSTek Computer Inc.
    0161  WL-161 802.11b Wireless Adapter [SiS 162U]
    160f  WL-160g 802.11g Wireless Adapter [Envara WiND512]
    3300  WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]
+2822  REFLEXdigital
+2833  Oculus VR, Inc.
+	0001  Rift Developer Kit 1
+	0021  Rift DK2
+	0031  Rift CV1
+	0101  Latency Tester
+	0137  Quest Headset
+	0201  Camera DK2
+	0211  Rift CV1 Sensor
+	0330  Rift CV1 Audio
+	1031  Rift CV1
+	2021  Rift DK2
+	2031  Rift CV1
+	3031  Rift CV1
+2836  OUYA
+286b  STANEO SAS
+	0003  D6BB/D9 seismic digitizer
+2886  Seeed Technology Co., Ltd.
+	0002  Seeeduino Lite
+2890  Teknic, Inc
+	0213  ClearPath 4-axis Comm Hub
 2899  Toptronic Industrial Co., Ltd
    012c  Camera Device
 289b  Dracal/Raphnet technologies
@@ -19452,23 +21965,105 @@
    000a  Dreamcast (Keyboard mode)
    000b  Gamecube/N64 controller v2.9 (Keyboard mode)
    000c  Gamecube/N64 controller v2.9 (Joystick mode)
+	000e  VirtualBoy controller
+	0010  WUSBMote v1.2 (Joystick mode)
+	0011  WUSBMote v1.2 (Mouse mode)
+	0012  WUSBMote v1.2.1 (Joystick mode)
+	0013  WUSBMote v1.2.1 (Mouse mode)
+	0014  WUSBMote v1.3 (Joystick mode)
+	0015  WUSBMote v1.3 (Mouse mode)
+	0016  WUSBMote v1.3 (I2C interface mode)
+	0017  Gamecube/N64 controller v3.0
+	0018  Atari Jaguar controller
+	0019  MultiDB9joy v3
+	001a  MultiDB9joy v3 (multitap mode)
    0100  Dual-relay board
    0500  Energy meter
    0502  Precision barometer
+289d  Seek Thermal, Inc.
+	0010  PIR206 Thermal Camera [Seek Compact]
+28bd  XP-Pen
+	0920  Star G960 Graphic Tablet
+28c7  Ultimaker B.V.
+	0001  3D printer serial interface
+28d4  Devialet
+	0008  120/200/250/400/800/D-Premier
 28de  Valve Software
    1102  Wired Controller
    1142  Wireless Steam Controller
    2000  Lighthouse FPGA RX
+	2012  Virtual Reality Controller [VRC]
    2101  Watchman Dongle
+	2500  Lighthouse Base Station
+28e0  PT. Prasimax Inovasi Teknologi
+	1001  BTS Monitoring Config for Prototype
+	5740  TRUMON TS-107
+	5741  TRUMON TS-108
+28e9  GDMicroelectronics
+	0189  GD32 DFU Bootloader (Longan Nano)
+28f3  Clover Network, Inc.
+	2000  Mobile Wi-Fi (C200)
+	3000  Mini
+	4000  Flex
+28f9  Profitap HQ BV
+	0001  Profishark 1G Black
+	0003  Profishark 1G+
+	0004  Profishark 1G
+	0005  Profishark 10G
+	0006  Profishark 100M
+290c  R. Hamilton & Co. Ltd.
+	4b4d  Mercury iPod Dock
+2912  Audioengine
+	20c8  D1 24-bit DAC
+	30c8  D1 24-bit DAC
+2916  Yota Devices
 2931  Jolla Oy
    0a01  Jolla Phone MTP
    0a02  Jolla Phone Developer
    0a05  Jolla PC connection
+	0a07  Phone MTP
    0afe  Jolla charging only
 2939  Zaber Technologies Inc.
    4959  A-MCB2
    495a  X-MCB1
    495b  X-MCB2
+	49b1  X-MCB1
+	49b2  X-MCB2
+	49c1  X-MCC1
+	49c2  X-MCC2
+	49c3  X-MCC3
+	49c4  X-MCC4
+2957  Obsidian Research Corporation
+	0001  Management Console
+2961  Miselu
+	0001  C.24 keyboard
+296b  Xacti Corporation
+	3917  CX-WE100 Camera
+2972  FiiO Electronics Technology
+	0007  X3 2nd gen audio player / DAC
+298d  Next Biometrics
+	2020  NB-2020-U Fingerprint Reader
+29bd  Silicon Works
+	4101  Multi-touch Device
+29c1  Taztag
+	1105  M17-G903-1 [Tazpad]
+	1107  M17-G903-A [Tazpad] (CCID)
+29c2  Lewitt GmbH
+	0001  DGT 650
+	0003  DGT 450
+	0009  DGT 260
+	0011  Stream 4x5
+29c3  Noviga
+29e2  Huatune Technology (Shanghai) Co., Ltd.
+29e7  Brunel University
+29e8  4Links Limited
+29ea  Kinesis Corporation
+	0102  Advantage2 Keyboard
+29f1  Canaan Creative Co., Ltd
+	33f1  Avalon nano 1.0
+	33f2  Avalon USB2IIC Converter
+	33f3  Avalon nano 2.0
+	40f1  Avalon4 mini
 2a03  dog hunter AG
    0001  Linino ONE (bootloader)
    0036  Arduino Leonardo (bootloader)
@@ -19476,7 +22071,7 @@
    0038  Arduino Robot Control (bootloader)
    0039  Arduino Robot Motor (bootloader)
    003a  Arduino Micro ADK rev3 (bootloader)
-	003b  Arduino Serial
+	003b  Arduino usb2serial
    003c  Arduino Explora (bootloader)
    003d  Arduino Due (usb2serial)
    003e  Arduino Due
@@ -19493,8 +22088,39 @@
    803c  Arduino Explora (CDC ACM)
    8041  Arduino Yun (CDC ACM)
    804d  Arduino Zero Pro (CDC ACM)
+2a0e  Shenzhen DreamSource Technology Co., Ltd.
+2a13  Grabba International
+	0000  S-Series data capture device
+2a19  Numato Systems Pvt. Ltd
+	1002  Mimas V2 Spartan6 FPGA Development Board
+	5440  TimVideos' HDMI2USB Opsis (FX2) - Unconfigured device
+	5441  TimVideos' HDMI2USB Opsis (FX2) - Firmware load/upgrade
+	5442  TimVideos' HDMI2USB Opsis (FX2) - HDMI/DVI Capture Device
+2a1d  Oxford Nanopore Technologies, Ltd
+	0000  MinION
+	0001  MinION
+	0010  VolTRAX
+	0011  VolTRAX
+	0020  GridION
+	0021  GridION
 2a37  RTD Embedded Technologies, Inc.
    5110  UPS35110/UPS25110
+2a39  RME
+	3fb0  Babyface Pro (Class Compliant Mode)
+	3fc0  Babyface Pro
+	3fc1  Fireface UFX+
+	3fc2  Fireface UFX+
+	3fd1  Fireface UFX+
+2a3c  Trinamic Motion Control GmbH & Co KG
+	0100  Stepper Device
+	0200  BLDC/PMSM Device
+	0300  Motor Control Device
+	0400  Motor Control Device
+	0500  PANdrive(TM)
+	0600  motionCookie(TM)
+	0700  Evaluation Device
+	0800  Interface Device
+	0900  Generic Device
 2a45  Meizu Corp.
    0001  MX Phone (BICR)
    0c02  MX Phone (MTP & ADB)
@@ -19504,6 +22130,29 @@
    200b  MX Phone (PTP)
    200c  MX Phone (PTP & ADB)
    2012  MX Phone (MTP & ACM)
+2a47  Mundo Reader, S.L.
+	0c02  bq Aquaris E4.5
+	201d  Tablet Edison 3
+	903a  bq Aquaris U
+2a4b  EMULEX Corporation
+	0400  Pilot4 Integrated Hub
+2a62  Flymaster Avionics
+	b301  LiveSD
+	b302  NavSD
+2a6e  Bare Conductive
+	0003  Touch Board
+	8003  Touch Board
+2a70  OnePlus Technology (Shenzhen) Co., Ltd.
+	4ee7  ONEPLUS A3010 [OnePlus 3T] / A5010 [OnePlus 5T] / A6003 [OnePlus 6] (Charging + USB debugging modes)
+	904d  A3000 phone (PTP mode) [3T]
+	904e  A3000 phone (PTP mode, with debug) [3T]
+2a88  DFU Technology Ltd
+	ffff  DFU
+2a8d  Keysight Technologies, Inc.
+2ab6  T+A elektroakustik GmbH & Co KG, Germany
+	0001  PDP3000HV DAC
+	0002  MP1000E, MP2000R, MP2500R, MP3100HV
+	0003  TA HD AUDIO V2
 2ac7  Ultrahaptics Ltd.
    0101  Evaluation Kit [Dragonfly]
    0102  UHDK5
@@ -19513,12 +22162,77 @@
    0112  STRATOS Inspire
    0113  STRATOS Inspire DFU
    ffff  DFU
+2ad1  Picotronic GmbH
+	7ab8  Turningtable
+2ae5  Fairphone B.V.
+	9015  2 (Mass storage & ADB)
+	9024  2 (RNDIS & ADB)
+	9039  2 (MTP & ADB)
+	904d  2 (PTP)
+	904e  2 (PTP & ADB)
+	90de  2 (Charging)
+	f000  2 (Mass storage)
+	f003  2 (MTP)
+	f005  2 (tethering)
+	f00e  2 (RNDIS)
+2aec  Ambiq Micro, Inc.
+	6011  Converter
+2af4  ROLI Ltd.
+	0100  Seaboard GRAND
+	0200  Seaboard RISE
+	0300  BlueWing Proto
+	0400  VOICE
+	0500  BLOCKS
+2b03  STEREOLABS
+	f580  ZED camera
+	f582  ZED camera
+	f680  ZED-M camera
+	f681  ZED-M HID Interface
+	f682  ZED-M camera
+	f683  ZED-M HID Interface
+	f684  ZED-M camera
+2b0e  LeEco
+	171b  Le2
+	171e  Le2 in USB tethering mode
+	1830  Le1 Pro
+	1844  Le Max2
+	2b0e  LeEco
+	6108  Lex720 [LePro 3] in connection sharing usb
+	610b  Lex720 [LePro 3] in Camera mode
+	610c  Lex720 [LePro 3]
+	610d  Lex720 [LePro 3] in debug
+2b23  Red Hat, Inc.
+	cafe  UsbDk (USB Development Kit)
 2b24  KeepKey LLC
-	0001  Bitcoin hardware wallet
+	0001  Bitcoin Wallet [KeepKey]
+	0002  Bitcoin Wallet
+2b3e  NewAE Technology Inc.
+	ace2  CW1173 [ChipWhisperer-Lite]
+2b4c  ZUK
+	1004  Z1 MTP
+2bc5  Orbbec 3D Technology International, Inc
+	0401  Astra
+	0403  Astra Pro
+	0407  Astra Mini S
+2bcc  InoTec GmbH Organisationssysteme
+2bd6  Coroware, Inc.
+	4201  RS-485 Controller and Interface [Cypress Semiconductor]
+2bd8  ROPEX Industrie-Elektronik GmbH
 2c02  Planex Communications
    14ea  GW-US11H WLAN
 2c1a  Dolphin Peripherals
    0000  Wireless Optical Mouse
+2c23  Supermicro Computer Incorporated
+	1b83  NIC
+2c4e  Mercucys INC
+	0100  MW300UM RTL8192EU wifi
+2c4f  Canon Electronic Business Machines Co., Ltd.
+	3003  PR Wireless Presenter
+2c55  Magic Leap, Inc.
+	a100  ML1 Lightpack (MLDB)
+	b100  ML1 Lightpack (fastboot)
+	c001  ML1 Control (COM)
+	c002  ML1 Control (Bootloader)
 2c7c  Quectel Wireless Solutions Co., Ltd.
    0121  EC21 LTE modem
    0125  EC25 LTE modem
@@ -19527,29 +22241,212 @@
    0296  BG96 CAT-M1/NB-IoT modem
    0306  EG06/EP06/EM06 LTE-A modem
    0435  AG35 LTE modem
+2c97  Ledger
+	0000  Blue
+	0001  Nano S
+	0004  Nano X
+2c99  Prusa
+	0001  i3 MK2S
+2c9c  Vayyar Imaging Ltd.
+	1000  Walabot Makers Series
+	1020  Walabot DIY
+	1022  Walabot DIY Plus
+	1030  Walabot Home (vHC)
+	9100  VNAKit
+2c9d  Nod Inc
+	90a0  Goa
+	bac5  Backspin
+2ca3  DJI Technology Co., Ltd.
+	0008  Mavic Mini MR1SD25 Remote controller
+2cb7  Fibocom
+	0210  L830-EB-00 LTE WWAN Modem
+2cc0  Hangzhou Zero Zero Infinity Technology Co., Ltd.
+2cc2  Lautsprecher Teufel GmbH
+2ccf  Hypersecu
+	0880  HyperFIDO
+2cd9  Cambrionix Ltd
+	0804  PowerSync4 USBPD Hub
 2cdc  Sea & Sun Technology GmbH
    f232  CTD48Mc CTD Probe
+2ce5  InX8 Inc [AKiTiO]
+	0014  Mass Storage [NT2 U31C]
+2cf0  Nuand LLC
+	5246  bladeRF
+	5250  bladeRF 2.0 micro
+2d1f  Wacom Taiwan Information Co. Ltd.
+2d25  Kronegger GmbH.
+2d2d  proxmark.org
+	504d  Proxmark3
+2d37  Zhuhai Poskey Technology Co.,Ltd
+2d6b  NetUP Inc.
+	7777  Joker TV universal DTV receiver
+2d81  Evollve Inc.
+	4f01  Ozobot Evo
+2d84  Zhuhai Poskey Technology Co.,Ltd
+	b806  DT-108B Thermal Label Printer
+2dc8  8BitDo
+	5006  M30 Bluetooth gamepad
+	5750  Bootloader
+	6000  SF30 Pro gamepad
+	6001  SN30/SF30 Pro gamepad
+	ab11  F30 gamepad
+	ab12  N30 gamepad
+	ab20  SN30/SF30 gamepad
+	ab21  SF30 gamepad
 2dcf  Dialog Semiconductor
+	c951  Audio Class 1.0 Devices
    c952  Audio Class 2.0 Devices
+2def  Kirale Technologies
+	0000  KiNOS Boot DFU
+	0102  KTWM102 Module
+2df2  LIPS Corporation
+	0213  LIPSedge DL 3D ToF Camera
+	0215  LIPSedge DL RGB Camera
+	2102  LIPSedge 5 Megapixel RGB Camera
+2e04  HMD Global
+	0001  Nokia 3310 3G
+	0002  Nokia 3310 3G
+	0a14  Nokia 3310 3G
+	c008  Tethering Network Interface
+	c009  Nokia 1 (bootloader)
+	c025  Nokia 8 (MTP mode)
+	c026  Nokia Smartphone
+	c029  Nokia 8 (PTP mode)
+	c031  Nokia 1 (PTP)
+	c03f  Nokia 8 (MIDI mode)
+2e0e  Hatteland Display AS
+	0001  CAN Gateway
+2e24  Hyperkin
+	0652  Duke Xbox One controller
+	1688  X91 Xbox One controller
+2e3b  uSens Inc.
+2e57  MEGWARE Computer Vertrieb und Service GmbH
+	454d  SlideSX EnergyMeter
+	454e  SlideSX EnergyMeter DFU
+	5cba  SlideSX / ClustSafe Bus Adapter
+2e69  Swift Navigation
+	1001  Piksi Multi
+2e95  SCUF Gaming
+	7725  Controller
+2f76  KeyXentic Inc.
+	0905  KX905 Smart Terminal
+	0906  KX906 Smart Card Reader
+	1906  KX906 Smart Token (Mass Storage)
+2fad  Definium Technologies
+2fb0  Infocrypt
 2fb2  Fujitsu, Ltd
+2fc0  Sensidyne, LP
+	0001  Project Archer
+2fc6  Comtrue Inc.
+	6012  UAC2 Device GB
+2fe0  Xaptum, Inc.
+	8b01  XAP-RC-001 ENF Router Card
+	8b02  XAP-RW-001 ENF Router Card with WiFi
+	8bde  XAP-EA-002 ENF Access Card
+	8bee  XAP-EA-003 ENF Access Card
+2fe3  NordicSemiconductor
+2fe7  ELGIN S.A.
+	0001  SMART S@T
+2feb  Beijing Veikk E-Commerce Co., Ltd.
+	0004  Veikk A15 Pen Tablet
+2ff4  Quixant Plc
 3016  Boundary Devices, LLC
    0001  Nitrogen Bootloader
+3036  Control iD
+	0001  Print iD
+	0002  iDBio
+3037  Beijing Chushifengmang Technology Development Co.,Ltd.
+3057  Kingsis Corporation
+	0002  ZOWIE Gaming mouse
+308f  Input Club
+	0000  Infinity 60% Bootloader
+	0001  Infinity 60% - Standard
+	0002  Infinity 60% - Hacker
+	0003  Infinity Ergodox Bootloader
+	0004  Infinity Ergodox
+	0005  WhiteFox Bootloader
+	0006  WhiteFox - Vanilla
+	0007  WhiteFox - ISO
+	0008  WhiteFox - Aria
+	0009  WhiteFox - Winkeyless
+	000a  WhiteFox - True Fox
+	000b  WhiteFox - Jack of All Trades
+	000c  Infinity 60% LED Bootloader
+	000d  Infinity 60% LED - Standard
+	000e  Infinity 60% LED - Hacker
+	000f  Infinity 60% LED - Alphabet
+	0010  K-Type Bootloader
+	0011  K-Type
+	0012  Kira Bootloader
+	0013  Kira
+	0014  Gemini Dawn/Dusk Bootloader
+	0015  Gemini Dawn/Dusk
+	0016  Re:Type Bootloader
+	0017  Re:Type
+	0018  Re:Type USB Hub
+	0019  WhiteFox (SAM4S) Bootloader
+	001a  WhiteFox (SAM4S) - Vanilla
+	001b  WhiteFox (SAM4S) - ISO
+	001c  WhiteFox (SAM4S) - Aria
+	001d  WhiteFox (SAM4S) - Winkeyless
+	001e  WhiteFox (SAM4S) - True Fox
+	001f  WhiteFox (SAM4S) - Jack of All Trades
 30a4  Blues Wireless
    0001  Notecard
 30c2  UNPARALLEL Innovation, Lda
    1388  SPL Meter
+30c9  Luxvisions Innotech Limited
 30ee  Fujitsu Connected Technologies Limited
    1001  F-01L
+30f2  Varex Imaging
+3111  Hiperscan GmbH
+	0000  SGS-NT Microspectrometer
+3112  Meteca SA
+	0001  MBC-WB01 (CDC-ACM)
+	0002  MBC-WB01 (Bootloader)
+	0003  ABC (CDC ACM)
+	0004  ABC (Bootloader)
 3125  Eagletron
    0001  TrackerPod Camera Stand
 3136  Navini Networks
+3145  SafeLogic Inc.
+3147  Tanvas, Inc.
+316c  SigmaSense, LLC
+316d  Purism, SPC
+	4c4b  Librem Key
+316e  SPECINFOSYSTEMS
+	0001  DIAMOND token
+3171  8086 Consultancy
+	0011  ClusterCTRL DA
+	0012  ClusterCTRL pHAT
+	0013  ClusterCTRL A+6
+	0014  ClusterCTRL Triple
+	0015  ClusterCTRL Single
 3176  Whanam Electronics Co., Ltd
 3195  Link Instruments
    f190  MSO-19
    f280  MSO-28
    f281  MSO-28
+31c9  BeiJing LanXum Computer Technology Co., Ltd.
+	1001  Printer
+	1301  Black and White Laser Printer
+	1501  LaserPrint GA50 series
+3200  Alcatel-Lucent Enterprise
+	2100  ALE 8058s
+	2101  ALE 8068s
+	2102  8078s
+3219  Smak Tecnologia e Automacao LTDA
+	0044  SKO44 Optical Keyboard
+321c  Premio, Inc.
+324c  CUPRIS Ltd.
+326d  Agile Display Solutions Co., Ltd
+	0001  Avocor USB Camera
 3275  VidzMedia Pte Ltd
    4fb1  MonsterTV P2H
+3293  Unhuman Inc.
+32b3  TEXA
+	d1a6  TXT Multihub
+	d1a7  TXT Multihub
 3333  InLine
    3333  2 port KVM switch model 60652K
 3334  AEI
@@ -19558,8 +22455,11 @@
    043a  Mio A701 DigiWalker PPCPhone
    0e3a  Pocket PC 300 GPS SL / Typhoon MyGuide 3500
    a0a3  deltaX 5 BT (D) PDA
+	ffff  Mio DigiWalker Sync
 3344  Leaguer Microelectronics (LME)
    3744  OEM PC Remote
+348f  ISY
+	2322  Wireless Presenter
 3504  Micro Star
    f110  Security Key
 3538  Power Quotient International Co., Ltd
@@ -19568,13 +22468,17 @@
    0022  Hi-Speed Mass Storage Device
    0042  Cool Drive U339 Flash Disk
    0054  Flash Drive (2GB)
+	0901  Traveling Disk U273 (4GB)
 3579  DIVA
    6901  Media Reader
 357d  Sharkoon
-	7788  QuickPort XT
+	7788  JMicron JMS567 ATA/ATAPI Bridge
 3636  InVibro
+3767  Fanatec
+	0101  Speedster 3 Forceshock Wheel
 3838  WEM
    0001  5-in-1 Card Reader
+	1031  2.4G Wireless Mouse
 3923  National Instruments Corp.
    12c0  DAQPad-6020E
    12d0  DAQPad-6507
@@ -19592,11 +22496,29 @@
    1f50  DAQPad-6036E
    2f80  DAQPad-6052E
    2f90  DAQPad-6052E
-	702b  GPIB-USB-B
+	702a  GPIB-USB-B
+	702b  GPIB-USB-B Initialization
    703c  USB-485 RS485 Cable
    709b  GPIB-USB-HS
+	7166  USB-8451
+	716e  USB-8451 Firmware Loader
+	717a  USB-6008
+	717b  USB-6009
+	71d6  USB-6008 OEM
+	71d7  USB-6009 OEM
+	71d8  USB-6009 OEM
    7254  NI MIO (data acquisition card) firmware updater
    729e  USB-6251 (OEM) data acquisition card
+	7346  USB-6229
+	755b  myDAQ
+	76af  USB-6000
+	76b0  USB-6000 OEM
+	76bf  USB-6001
+	76c0  USB-6001 OEM
+	76c4  USB-6002
+	76c5  USB-6002 OEM
+	76c6  USB-6003
+	76c7  USB-6003 OEM
 40bb  I-O Data
    0a09  USB2.0-SCSI Bridge USB2-SC
 4101  i-rocks
@@ -19634,19 +22556,26 @@
    1005  Multimedia Pro Keyboard Hub
    2001  Keyboard HID Support
    2002  SK-8125 Keyboard
-	2003  Keyboard
+	2003  Keyboard SK-8115
    2005  RT7D50 Keyboard
    2010  Keyboard
    2011  Multimedia Pro Keyboard
    2100  SK-3106 Keyboard
-	2101  SmartCard Reader Keyboard
+	2101  SK-3205 SmartCard Reader Keyboard
    2105  Model L100 Keyboard
-	2106  Dell QuietKey Keyboard
+	2106  QuietKey Keyboard
+	2107  KB212-B Quiet Key Keyboard
+	2113  KB216 Wired Keyboard
+	2134  Hub of E-Port Replicator
+	21d7  Dell Wireless 5560 HSPA+ Mobile Broadband Modem
    2500  DRAC4 Remote Access Card
+	2501  Keyboard and mouse dongle
    2513  internal USB Hub of E-Port Replicator
    3010  Optical Wheel Mouse
    3012  Optical Wheel Mouse
    3016  Optical 5-Button Wheel Mouse
+	301a  Dell MS116 Optical Mouse
+	301b  Universal Bluetooth Receiver
    3200  Mouse
    4001  Axim X5
    4002  Axim X3
@@ -19673,6 +22602,7 @@
    5118  AIO 810
    5124  Laser MFP 1815
    5128  Photo AIO 928
+	5133  968 AIO Printer
    5200  Laser Printer
    5202  Printing Support
    5203  Printing Support
@@ -19681,13 +22611,18 @@
    5220  Laser MFP 1600n
    5225  Printing Support
    5226  Printing Support
+	5228  Laser Printer 1720dn
    5300  Laser Printer
    5400  Laser Printer
    5401  Laser Printer
+	5404  1250c Color Printer
    5513  WLA3310 Wireless Adapter [Intersil ISL3887]
+	5534  Hub of E-Port Replicator
    5601  Laser Printer 3100cn
    5602  Laser Printer 3000cn
+	5607  MFP Color Laser Printer 3115cn
    5631  Laser Printer 5100cn
+	564a  C1765 series Multifunction Color LaserPrinter, Scanner & Copier
    5905  Printing Support
    8000  BC02 Bluetooth Adapter
    8010  TrueMobile Bluetooth Module in
@@ -19722,6 +22657,7 @@
    8138  Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port
    8140  Wireless 360 Bluetooth
    8142  Mobile 360 in DFU
+	8143  Broadcom BCM20702A0 Bluetooth
    8147  F3507g Mobile Broadband Module
    8156  Wireless 370 Bluetooth Mini-card
    8157  Integrated Keyboard
@@ -19736,11 +22672,22 @@
    8185  Gobi 2000 Wireless Modem (QDL mode)
    8186  Gobi 2000 Wireless Modem
    8187  DW375 Bluetooth Module
+	818e  DW5560 miniPCIe HSPA+ Mobile Broadband Modem
+	8197  BCM20702A0 Bluetooth Module
+	81a0  Wireless 5808 Mobile Broadband (Sierra Wireless MC7355 Mini PCIE, 4G UMTS,HSDPA,HSPA+,LTE,1xRTT,EVDO Rev A,GSM,GPRS)
+	81a3  Hub of E-Port Replicator
+	81a8  Wireless 5808 Mobile Broadband (Sierra Wireless Mini PCIE, 4G UMTS,HSDPA,HSPA+,LTE,1xRTT,EVDO Rev A,GSM,GPRS)
    8501  Bluetooth Adapter
+	9001  ATA Bridge
+	9009  Portable Device
    9500  USB CP210x UART Bridge Controller [DW700]
    a001  Hub
    a005  Internal 2.0 Hub
+	a101  Internal Dual SD Card module
+	a102  iDRAC Virtual NIC
+	a503  AC511 Sound Bar
    a700  Hub (in 1905FP LCD Monitor)
+	b007  Streak 5 Android Tablet
 4146  USBest Technology
    9281  Iomega Micro Mini 128MB Flash Drive
    ba01  Intuix Flash Drive
@@ -19757,8 +22704,9 @@
    0701  U.S. Robotics USR5425 Wireless MAXg Adapter
    0711  Belkin F5D7051 v3000 802.11g
    0720  Dynex DX-BUSB
+	0721  Dynex DX-EBUSB
 4348  WinChipHead
-	5523  USB->RS 232 adapter with Prolifec PL 2303 chipset
+	5523  USB->RS 232 adapter with Prolific PL 2303 chipset
    5537  13.56Mhz RFID Card Reader and Writer
    5584  CH34x printer adapter cable
 4572  Shuttle, Inc.
@@ -19767,6 +22715,7 @@
    1026  Crystal Bar Flash Drive
 4670  EMS Production
    9394  Game Cube USB Memory Adaptor 64M
+46f4  QEMU
 4752  Miditech
    0011  Midistart-2
 4757  GW Instek
@@ -19777,8 +22726,18 @@
 4855  Memorex
    7288  Ultra Traveldrive 160G 2.5" HDD
 4971  SimpleTech
+	1004  Hitachi LifeStudio Desk (3.5" HDD) [w/o flash key]
+	1013  Touro Desk Pro
+	1015  Touro Desk 3.0
+	8001  G-Tech G-DRIVE Mobile
    cb01  SP-U25/120G
+	cd15  Simple Drive Mini (2.5" HDD)
+	ce07  SimpleDrive (3.5" HDD)
+	ce12  FV-U35
    ce17  1TB SimpleDrive II USB External Hard Drive
+	ce18  (re)Drive
+	ce21  JMicron JM20329 SATA Bridge [eg. HITACHI SimpleDrive mini]
+	ce22  Hitachi SimpleTough (3.5" HDD)
 4d46  Musical Fidelity
    0001  V-Link
    0002  V-DAC II
@@ -19787,19 +22746,24 @@
    0bb9  Grandtec USB1.1 DVB-T (warm)
    0fa0  Grandtec USB1.1 DVB-T (cold)
    0fa1  Grandtec USB1.1 DVB-T (warm)
-5041  Linksys (?)
-	2234  WUSB54G v1 802.11g Adapter [Intersil ISL3886]
-	2235  WUSB54GP v1 802.11g Adapter [Intersil ISL3886]
 50c2  Averatec (?)
    4013  WLAN Adapter
+5131  MSR
+	2007  MSR-101U Mini HID magnetic card reader
 5173  Sweex
    1809  ZD1211
 5219  I-Tetra
    1001  Cetus CDC Device
+5332  Clearly Superior Technologies, Inc.
+	1300  CST2545-5W (L-Trac)
 5345  Owon
    1234  PDS6062T Oscilloscope
 534c  SatoshiLabs
    0001  Bitcoin Wallet [TREZOR]
+	0002  Bitcoin Wallet [TREZOR v2]
+534d  MacroSilicon
+	0021  MS210x Video Grabber [EasierCAP]
+	6021  VGA Display Adapter
 5354  Meyer Instruments (MIS)
    0017  PAXcam2
 544d  Transmeta Corp.
@@ -19810,7 +22774,10 @@
    0005  Tablet WP8060U
    0041  Genius PenSketch 6x8 Tablet
    0042  Tablet PF1209
+	004a  XP-Pen Artist 10S tablet
+	004d  Tablet Monitor MSP19U
    0064  Aiptek HyperPen 10000U
+	3031  Graphics tablet [DrawImage G3, Ugee G3]
 5555  Epiphan Systems Inc.
    1110  VGA2USB
    1120  KVM2USB
@@ -19821,6 +22788,10 @@
    3344  KVM2USB LR
    3411  DVI2USB Solo
    3422  DVI2USB Duo
+	3500  DVI2USB3
+	3501  DVI2USB3 Rev3
+	3510  DVI2USB3_ET
+	3520  SDI2USB3
 55aa  OnSpec Electronic, Inc.
    0015  Hard Drive
    0102  SuperDisk
@@ -19846,14 +22817,41 @@
    0100  Orbicam
    0101  USB2.0 Camera
    0102  Crystal Eye Webcam
+	0137  HP Webcam
+	0141  BisonCam, NB Pro
+	0149  HP Webcam-101
+	014c  MSI Integrated Webcam
    01a6  Lenovo Integrated Webcam
    01a7  Lenovo Integrated Webcam
    01a9  Lenovo Integrated Webcam
    0200  OrbiCam
+	0202  Fujitsu Webcam
    0203  BisonCam NB Pro 1300
+	0205  Lenovo EasyCamera
+	0217  Integrated Webcam
    0241  BisonCam, NB Pro
+	0268  SunplusIT INC. Integrated Camera
+	026a  Integrated Camera
+	0292  Lenovo Integrated Webcam
+	0294  Lenovo Integrated Webcam
+	0295  Lenovo Integrated Webcam
+	0299  Lenovo Integrated Webcam
+	029c  Lenovo EasyCamera
+	02ac  HP TrueVision HD Webcam
    02d0  Lenovo Integrated Webcam [R5U877]
+	02d2  ThinkPad Integrated Camera
+	02d5  Integrated Camera
+	03b3  Lenovo Integrated Webcam
    03d0  Lenovo Integrated Webcam [R5U877]
+	0400  BisonCam, NB Pro
+	0535  Lenovo EasyCamera integrated webcam
+	055a  Lenovo Integrated Webcam
+	0652  Lenovo EasyCamera
+	0670  Lenovo EasyCamera
+	0671  Lenovo EasyCamera
+	0706  ThinkPad P50 Integrated Camera
+	2113  SunplusIT Integrated Camera
+	a002  Lenovo EasyCamera Integrated Webcam
 59e3  Nonolith Labs
 5a57  Zinwell
    0260  RT2570
@@ -19861,15 +22859,19 @@
    0282  802.11b/g/n USB Wireless LAN Card
    0283  802.11b/g/n USB Wireless LAN Card
    0284  802.11a/b/g/n USB Wireless LAN Card
-	0290  ZW-N290 802.11n [Realtek RTL8192SU]
+	0290  ZW-N290 802.11n [Realtek RTL8192U]
    5257  Metronic 495257 wifi 802.11ng
 6000  Beholder International Ltd.
+	0001  Trident TVBOX Video Grabber
    dec0  TV Wander
    dec1  TV Voyage
 601a  Ingenic Semiconductor Ltd.
    4740  XBurst Jz4740 boot mode
+	4760  JZ4760 Boot Device
+6022  Xektek
+	0500  SuperPro Universal Device Programmer
 6189  Sitecom
-	182d  USB 2.0 Ethernet
+	182d  LN-029 10/100 Ethernet Adapter
    2068  USB to serial cable (v2)
 6244  LightingSoft AG
    0101  Intelligent Usb Dmx Interface SIUDI5A
@@ -19900,23 +22902,46 @@
    0491  Intelligent Usb Dmx Interface SIUDI9D
    0500  Touch Sensitive Intelligent Control Keypad STICK2B Firmware download
    0501  Touch Sensitive Intelligent Control Keypad STICK2B
+	0520  Touch Sensitive Intelligent Control Keypad (STICK2C Firmware download, 32/64bits
+	0521  Touch Sensitive Intelligent Control Keypad (STICK2C, 32/64bits)
+	0540  Sunlite Universal Smart Handy Interface (SUSHI1A Firmware download, 32/64bits)
+	0541  Sunlite Universal Smart Handy Interface (SUSHI1A, 32/64bits)
+	0570  Touch Sensitive Intelligent Control Keypad (STICK4A Firmware download, 32/64bits)
+	0571  Touch Sensitive Intelligent Control Keypad (STICK4A, 32/64bits)
+	0580  Touch Sensitive Intelligent Control Keypad (STICK5A Firmware download, 32/64bits)
+	0581  Touch Sensitive Intelligent Control Keypad (STICK5A, 32/64bits)
+	0590  Intelligent Dmx Interface (SIUDI9S Firmware Download, 32/64bits)
+	0591  Intelligent Dmx Interface (SIUDI9S, 32/64bits)
+	0600  Intelligent Dmx Interface (SIUDI9M Firmware Download, 32/64bits)
+	0601  Intelligent Dmx Interface (SIUDI9M, 32/64bits)
+	0610  Intelligent Dmx Interface SIUDI10A Firmware Download
+	0611  Intelligent Dmx Interface SIUDI10A
 6253  TwinHan Technology Co., Ltd
    0100  Ir reciver f. remote control
 636c  CoreLogic, Inc.
-6472  Unknown (Sony?)
+6472  Sony Corp.
    01c8  PlayStation Portable [Mass Storage]
 6547  Arkmicro Technologies Inc.
    0232  ARK3116 Serial
+6557  Emtec
+	5500  Mass Storage Device
+	8005  Car Key
 6615  IRTOUCHSYSTEMS Co. Ltd.
    0001  Touchscreen
+	0020  IRTOUCH InfraRed TouchScreen
+	0081  TouchScreen
 6666  Prototype product Vendor ID
    0667  WiseGroup Smart Joy PSX, PS-PC Smart JoyPad
+	1c40  TELEMIC 802.15.4 Sensor node (Bootloader)
+	1c41  TELEMIC 802.15.4 Sensor node
    2667  JCOP BlueZ Smartcard reader
    8802  SmartJoy Dual Plus PS2 converter
    8804  WiseGroup SuperJoy Box 5
 6677  WiseGroup, Ltd.
    8802  SmartJoy Dual Plus PS2 converter
    8811  Deluxe Dance Mat
+675d  Humanscale
+	062a  Switch Mouse
 6891  3Com
    a727  3CRUSB10075 802.11bg [ZyDAS ZD1211]
 695c  Opera1
@@ -19928,17 +22953,47 @@
    2202  UF5/UF6/UF7/UF8 MIDI Master Keyboard
 726c  StackFoundry LLC
    2149  EntropyKing Random Number Generator
+7302  Solinftec
+	0001  HUB 4X232
 734c  TBS Technologies China
    5920  Q-Box II DVB-S2 HD
    5928  Q-Box II DVB-S2 HD
 7373  Beijing STONE Technology Co. Ltd.
    5740  Intelligent TFT-LCD Module
 7392  Edimax Technology Co., Ltd
-	7711  EW-7711UTn nLite Wireless Adapter [Ralink RT2870]
-	7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]
+	7711  EW-7711UTn nLite Wireless Adapter [Ralink RT3070]
+	7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2770]
    7718  EW-7718UN 802.11n Wireless Adapter [Ralink RT2870]
-	7722  EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x]
+	7722  EW-7722UTn 802.11n Wireless Adapter [Ralink RT3072]
+	7733  EW-7733UnD 802.11abgn 3x3:3 [Ralink RT3573]
    7811  EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS]
+	7822  EW-7612UAn V2 802.11n Wireless Adapter [Realtek RTL8192CU]
+	a611  EW-7611ULB 802.11b/g/n and Bluetooth 4.0 Adapter
+	a711  EW-7711MAC 802.11ac Wireless Adapter
+	a811  EW-7811UTC 802.11ac Wireless Adapter
+	b711  EW-7722UAC 802.11a/b/g/n/ac (2x2) Wireless Adapter [MediaTek MT7612U]
+	b822  EW-7822ULC 802.11ac Wireless Adapter [Realtek RTL8812AU]
+73d8  Progeny Dental Equipment Specialists
+	0104  VetPro DR, Size 1
+	0105  VetPro DR, Size 2
+7669  Venable Instruments
+	350c  Model 350c, Frequency Response Analyzer
+	5140  Model 5140, Frequency Response Analyzer
+	6305  Model 6305, Frequency Response Analyzer
+	6320  Model 6320, Frequency Response Analyzer
+	6340  Model 6340, Frequency Response Analyzer
+	7405  Model 7405, Frequency Response Analyzer
+	7420  Model 7420, Frequency Response Analyzer
+	7440  Model 7440, Frequency Response Analyzer
+	8805  Model 8805, Frequency Response Analyzer
+	8820  Model 8820, Frequency Response Analyzer
+	8840  Model 8840, Frequency Response Analyzer
+7825  Other World Computing
+	a2a4  External SATA Hard Drive Adapter cable PA023U3
+	b0b3  miniStack MAX
+8070  ACCES I/O Products, Inc.
+	8003  USB-DIO-96
+	8070  USB-AO16-16A
 8086  Intel Corp.
    0001  AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter
    0044  CPU DRAM Controller
@@ -19952,18 +23007,22 @@
    0182  WiMAX Connection 2400m
    0186  WiMAX Connection 2400m
    0188  WiMAX Connection 2400m
+	0189  Centrino Advanced-N 6230 Bluetooth adapter
    0200  AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A]
-	0431  Intel Pro Video PC Camera
+	0431  Pro Video PC Camera
    0510  Digital Movie Creator
    0630  Pocket PC Camera
    0780  CS780 Microphone Input
    07d3  BLOB boot loader firmware
+	07dc  Bluetooth 4.0* Smart Ready (low energy)
+	0b07  RealSense D435
    0dad  Cherry MiniatureCard Keyboard
    1010  AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter
    110a  Bluetooth Controller from (Ericsson P4A)
    110b  Bluetooth Controller from (Intel/CSR)
    1110  PRO/Wireless LAN Module
    1111  PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5]
+	1122  Integrated Hub
    1134  Hollister Mobile Monitor
    1139  In-Target Probe (ITP)
    1234  Prototype Reader/Writer
@@ -19976,31 +23035,60 @@
    3240  AnyPoint® 3240 Modem - WAN
    3241  AnyPoint® 3240 Modem
    8602  Miniature Card Slot
-	9303  Intel 8x930Hx Hub
+	8c26  8 Series/C220 Series  EHCI #1
+	8c2d  8 Series/C220 Series EHCI #2
+	8c31  eXtensible Host Controller
+	9303  8x930Hx Hub
    9500  CE 9500 DVB-T
    9890  82930 Test Board
    beef  SCM Miniature Card Reader/Writer
    c013  Wireless HID Station
+	dead  Galileo
    f001  XScale PXA27x Bulverde flash
    f1a5  Z-U130 [Value Solid State Drive]
 8087  Intel Corp.
    0020  Integrated Rate Matching Hub
    0024  Integrated Rate Matching Hub
+	0025  Wireless-AC 9260 Bluetooth Adapter
+	0029  AX200 Bluetooth
+	0716  Modem Flashloader
+	07da  Centrino Bluetooth Wireless Transceiver
+	07dc  Bluetooth wireless interface
+	07eb  Oaktrail tablet
+	0a2a  Bluetooth wireless interface
+	0a2b  Bluetooth wireless interface
+	0a9e  Edison
+	0aa7  Wireless-AC 3168 Bluetooth
+	0aaa  Bluetooth 9460/9560 Jefferson Peak (JfP)
+	0fff  Intel Android Bootloader Interface
+	8000  Integrated Rate Matching Hub
+	8001  Integrated Hub
+	8002  8 channel internal hub
+	8008  Integrated Rate Matching Hub
+	800a  Hub
 80ee  VirtualBox
    0021  USB Tablet
+	0022  multitouch tablet
 8282  Keio
    3201  Retro Adapter
    3301  Retro Adapter Mouse
+8301  Hapurs
+	0089  HPBT05R 2.4 G Mini Wireless Touchpad Keyboard
 8341  EGO Systems, Inc.
    2000  Flashdisk
 8564  Transcend Information, Inc.
    1000  JetFlash
-	4000  RDF8
+	4000  microSD/SD/CF UHS-II Card Reader [RDF8, RDF9]
+	6000  digital photo frame PF830
+	6002  digital photo frame PF830
+	7000  StoreJet 25H3
 8644  Intenso GmbG
    8003  Micro Line
    800b  Micro Line (4GB)
 8e06  CH Products, Inc.
    f700  DT225 Trackball
+8ea3  Doosl
+	a02c  Wireless Presenter Receiver
 9016  Sitecom
    182d  WL-022 802.11b Adapter
 9022  TeVii Technology Ltd.
@@ -20010,6 +23098,7 @@
 9148  GeoLab, Ltd
 # All of GeoLab's devices share the same ID 0004.
    0004  R3 Compatible Device
+9516  Studiologic
 9710  MosChip Semiconductor
    7703  MCS7703 Serial Port Adapter
    7705  MCS7705 Parallel port adapter
@@ -20018,11 +23107,17 @@
    7720  MCS7720 Dual serial port adapter
    7730  MCS7730 10/100 Mbps Ethernet adapter
    7780  MCS7780 4Mbps Fast IrDA Adapter
+	7784  MCS7784 115.2Kb IrDA Adapter
+	7810  MCS7810 Serial Port Adapter
+	7820  MCS7820 Dual Serial Port Adapter
    7830  MCS7830 10/100 Mbps Ethernet adapter
    7832  MCS7832 10/100 Mbps Ethernet adapter
    7840  MCS7820/MCS7840 2/4 port serial adapter
+	9990  MCS9990 PCIe Host Controller
 9849  Bestmedia CD Recordable GmbH & Co. KG
    0701  Platinum MyDrive HP
+9886  Astro Gaming
+	0015  A50
 9999  Odeon
    0001  JAF Mobile Phone Flasher Interface
 99fa  Grandtec
@@ -20031,6 +23126,11 @@
    4b8f  ProxMark-3 RFID Instrument
 9e88  Marvell Semiconductor, Inc.
    9e8f  Plug Computer Basic [SheevaPlug]
+a014  Insignia (Best Buy)
+	b014  Desktop Microphone NS-PAUM50
+a108  Ingenic Semiconductor Co.,Ltd
+	1000  X1000
+	4775  JZ4775 Boot Device
 a128  AnMo Electronics Corp. / Dino-Lite (?)
    0610  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
    0611  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
@@ -20049,33 +23149,63 @@ a168  AnMo Electronics Corporation
    0615  Dino-Lite Pro Digital Microscope
    0617  Dino-Lite Pro Digital Microscope
    0618  Dino-Lite Digital Microscope
-a600  Asix
+a466  Haikou Xingong Electronics Co.,Ltd
+	0a53  TL866II Plus Device Programmer [MiniPRO]
+a600  ASIX s.r.o.
+	5500  zuban H2OPS - GPS for canoeing
+	a000  SIGMA Logic Analyzer
+	a002  EMUSB interface pro MU Beta
+	c000  MREL Data Trap II
+	c001  VUTS DMU4
+	c002  Electrone MASH
+	c005  MREL HTU HandiTrap cable
+	c006  JRC COmeter
    e110  OK1ZIA Davac 4.x
+	e112  OK1ZIA Antenna rotator
+	e113  OK1ZIA GPIO
+	e114  OK1ZIA HD&Keyb
 a727  3Com
    6893  3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523]
    6895  AR5523
    6897  AR5523
+a88a  Clas Ohlsson
+	3003  PCFree Multimedia Remote Control PC
 aaaa  MXT
    8815  microSD CardReader
-abcd  Unknown
+	8816  microSD CardReader
+ab12  aplic
+	34cd  JMICRON JMS578 SATA 6Gb/s bridge
+abcd  LogiLink
+	1234  UDisk flash drive
+	6104  PCCloneEX Lite+ SATA docking station [QP0017]
    cdee  Petcam
 b58e  Blue Microphones
    9e84  Yeti Stereo Microphone
+ba77  Clockmaker
+	7147  Agterbosch
 c216  Card Device Expert Co., LTD
    0180  MSR90 MagStripe reader
 c251  Keil Software, Inc.
+	1705  MCB2300
    2710  ULink
+	2723  ULink-ME
+c502  AGPTek
+	0029  Rocker
 cace  CACE Technologies Inc.
    0002  AirPCAP Classic 802.11 packet capture adapter
-	0300  AirPcap NX [Atheros AR9001U-(2)NG]
+	0300  AirPcap NX [Atheros AR9170+AR9104]
 cd12  SMART TECHNOLOGY INDUSTRIAL LTD.
 d208  Ultimarc
    0310  Mini-PAC Arcade Control Interface
 d209  Ultimarc
    0301  I-PAC Arcade Control Interface
    0501  Ultra-Stik Ultimarc Ultra-Stik Player 1
+	1571  A-PAC Arcade Control Interface
 d904  LogiLink
    0003  Laser Mouse (ID0009A)
+e2b7  Jie Li
+	0811  CD002
+	0812  CD005 MP3 Player
 e4e4  Xorcom Ltd.
    1130  Astribank series
    1131  Astribank series
@@ -20099,20 +23229,37 @@ eb1a  eMPIA Technology, Inc.
    2750  ECS Elitegroup G220 integrated Webcam
    2761  EeePC 701 integrated Webcam
    2776  Combined audio and video input device
-	2800  Terratec Cinergy 200
-	2801  GrabBeeX+ Video Encoder
+	2800  EM2800 Video Capture
+	2801  EM2801 Video Capture
+	2820  EM2820 Video Capture
+	2821  EM2820 Video Capture
+	2840  EM2840 Video Capture
+	2841  EM2840 Video Capture
+	2861  EasyCAP DC60+ [EM2861]
    2863  Video Grabber
    2870  Pinnacle PCTV Stick
    2881  EM2881 Video Controller
    50a3  Gadmei UTV380 TV Box
    50a6  Gadmei UTV330 TV Box
+	5166  video grabber 28282
+	5184  VIDBOX NW06 [EM28281]
+	8179  Terratec Cinergy T2 Stick HD
+	e305  KWorld PlusTV Analog Stick
    e355  KWorld DVB-T 355U Digital TV Dongle
 eb2a  KWorld
 ef18  SMART TECHNOLOGY INDUSTRIAL LTD.
 f003  Hewlett Packard
    6002  PhotoSmart C500
+f007  Teslong
+	a999  Endoscope Camera
+	b999  Otoscope Camera
 f182  Leap Motion
    0003  Controller
+f3f0  CCT, Inc
+	0740  multi-function device
+	1340  multi-function printer
+	1440  printer device
+	1921  printer
 f4ec  Atten Electronics / Siglent Technologies
    ee38  Digital Storage Oscilloscope
 f4ed  Shenzhen Siglent Co., Ltd.
@@ -20120,8 +23267,11 @@ f4ed  Shenzhen Siglent Co., Ltd.
    ee3a  SDG1010 Waveform Generator (TMC mode)
 f766  Hama
    0001  PC-Gamepad "Greystorm"
+fa11  DyingLight
+	5afe  DyingLight
 fc08  Conrad Electronic SE
    0101  MIDI Cable UA0037
+ff00  Power Delivery
 ffee  FNK Tech
    0100  Card Reader Controller RTS5101/RTS5111/RTS5116
diff --git a/src/initscripts/packages/amavisd b/src/initscripts/packages/amavisd
deleted file mode 100644
index 115ffe973..000000000
--- a/src/initscripts/packages/amavisd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/amavisd
-#
-# Description : Amavisd Init Script
-#
-# Authors     : Michael Tremer (ms@ipfire.org)
-#
-# Version     : 01.00
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-	start)
-		boot_mesg "Starting AMaViS Daemon..."
-		loadproc /usr/bin/amavisd
-		;;
-
-	stop)
-		boot_mesg "Stopping AMaViS Daemon..."
-		killproc /usr/bin/amavisd
-		;;
-
-	restart)
-		${0} stop
-		sleep 1
-		${0} start
-		;;
-
-	status)
-		statusproc /usr/bin/amavisd
-		;;
-
-	*)
-		echo "Usage: ${0} {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/amavisd
diff --git a/src/initscripts/packages/spamassassin b/src/initscripts/packages/spamassassin
deleted file mode 100644
index 73403a8ec..000000000
--- a/src/initscripts/packages/spamassassin
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/spamassassin
-#
-# Description : Spamassassin Init Script
-#
-# Authors     : Michael Tremer (ms@ipfire.org)
-#
-# Version     : 01.00
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-	start)
-		boot_mesg "Starting Spamassassin Daemon..."
-		loadproc -n 10 /usr/bin/spamd -d
-		;;
-
-	stop)
-		boot_mesg "Stopping Spamassassin Daemon..."
-		killproc /usr/bin/spamd
-		;;
-
-	restart)
-		${0} stop
-		sleep 1
-		${0} start
-		;;
-
-	status)
-		statusproc /usr/bin/spamd
-		;;
-
-	*)
-		echo "Usage: ${0} {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/spamassassin
diff --git a/src/initscripts/system/network b/src/initscripts/system/network
index 6e7120885..32b34343e 100644
--- a/src/initscripts/system/network
+++ b/src/initscripts/system/network
@@ -67,9 +67,17 @@ case "${DO}" in
    	/usr/local/bin/ipsec-interfaces
/etc/rc.d/init.d/static-routes start
+
+		boot_mesg "Mounting network file systems..."
+		mount -a -O _netdev
+		evaluate_retval
    	;;
stop)
+		boot_mesg "Umounting network file systems..."
+		umount -a -O _netdev
+		evaluate_retval
+
    	# Stopping interfaces...
    	# GREEN
    	[ "$green" == "1" ] && /etc/rc.d/init.d/networking/green stop
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index acbf6f5b5..5c5d2e3f4 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -502,45 +502,44 @@ update_safe_search() {
    	unbound-control local_zone_remove "${domain}"
    done >/dev/null
-	# Nothing to do if safe search is not enabled
-	if [ "${ENABLE_SAFE_SEARCH}" != "on" ]; then
-		return 0
-	fi
-
-	# Bing
-	unbound-control bing.com transparent >/dev/null
-	for address in $(resolve "strict.bing.com"); do
-		unbound-control local_data "www.bing.com ${LOCAL_TTL} IN A ${address}"
-	done >/dev/null
-
-	# DuckDuckGo
-	unbound-control local_zone duckduckgo.com typetransparent >/dev/null
-	for address in $(resolve "safe.duckduckgo.com"); do
-		unbound-control local_data "duckduckgo.com ${LOCAL_TTL} IN A ${address}"
-	done >/dev/null
-
-	# Google
-	local addresses="$(resolve "forcesafesearch.google.com")"
-	for domain in ${google_tlds[@]}; do
-		unbound-control local_zone "${domain}" transparent >/dev/null
-		for address in ${addresses}; do
-			unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}"
+	if [ "${ENABLE_SAFE_SEARCH}" = "on" ]; then
+		# Bing
+		unbound-control bing.com transparent >/dev/null
+		for address in $(resolve "strict.bing.com"); do
+			unbound-control local_data "www.bing.com ${LOCAL_TTL} IN A ${address}"
    	done >/dev/null
-	done
-	# Yandex
-	for domain in yandex.com yandex.ru; do
-		unbound-control local_zone "${domain}" typetransparent >/dev/null
-		for address in $(resolve "familysearch.${domain}"); do
-			unbound-control local_data "${domain} ${LOCAL_TTL} IN A ${address}"
+		# DuckDuckGo
+		unbound-control local_zone duckduckgo.com typetransparent >/dev/null
+		for address in $(resolve "safe.duckduckgo.com"); do
+			unbound-control local_data "duckduckgo.com ${LOCAL_TTL} IN A ${address}"
    	done >/dev/null
-	done
-	# YouTube
-	unbound-control local_zone youtube.com transparent >/dev/null
-	for address in $(resolve "restrictmoderate.youtube.com"); do
-		unbound-control local_data "www.youtube.com ${LOCAL_TTL} IN A ${address}"
-	done >/dev/null
+		# Google
+		local addresses="$(resolve "forcesafesearch.google.com")"
+		for domain in ${google_tlds[@]}; do
+			unbound-control local_zone "${domain}" transparent >/dev/null
+			for address in ${addresses}; do
+				unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}"
+			done >/dev/null
+		done
+
+		# Yandex
+		for domain in yandex.com yandex.ru; do
+			unbound-control local_zone "${domain}" typetransparent >/dev/null
+			for address in $(resolve "familysearch.${domain}"); do
+				unbound-control local_data "${domain} ${LOCAL_TTL} IN A ${address}"
+			done >/dev/null
+		done
+
+		# YouTube
+		if [ "${ENABLE_SAFE_SEARCH_YOUTUBE}" = "on" ]; then
+			unbound-control local_zone youtube.com transparent >/dev/null
+			for address in $(resolve "restrictmoderate.youtube.com"); do
+				unbound-control local_data "www.youtube.com ${LOCAL_TTL} IN A ${address}"
+			done >/dev/null
+		fi
+	fi
return 0
 }
diff --git a/src/patches/bash/bash50-012 b/src/patches/bash/bash50-012
new file mode 100644
index 000000000..7470e7665
--- /dev/null
+++ b/src/patches/bash/bash50-012
@@ -0,0 +1,64 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-012
+
+Bug-Reported-by:	lessbug@qq.com
+Bug-Reference-ID:	tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com
+Bug-Reference-URL:
+
+Bug-Description:
+
+When using previous-history to go back beyond the beginning of the history list,
+it's possible to move to an incorrect partial line.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/lib/readline/misc.c	2017-07-07 17:30:12.000000000 -0400
+--- lib/readline/misc.c	2019-05-16 11:43:46.000000000 -0400
+***************
+*** 577,580 ****
+--- 590,594 ----
+  {
+    HIST_ENTRY *old_temp, *temp;
++   int had_saved_line;
+  
+    if (count < 0)
+***************
+*** 589,592 ****
+--- 603,607 ----
+  
+    /* If we don't have a line saved, then save this one. */
++   had_saved_line = _rl_saved_line_for_history != 0;
+    rl_maybe_save_line ();
+  
+***************
+*** 612,616 ****
+    if (temp == 0)
+      {
+!       rl_maybe_unsave_line ();
+        rl_ding ();
+      }
+--- 627,632 ----
+    if (temp == 0)
+      {
+!       if (had_saved_line == 0)
+!         _rl_free_saved_history_line ();
+        rl_ding ();
+      }
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash50-013 b/src/patches/bash/bash50-013
new file mode 100644
index 000000000..e44fdb505
--- /dev/null
+++ b/src/patches/bash/bash50-013
@@ -0,0 +1,73 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-013
+
+Bug-Reported-by:	HIROSE Masaaki hirose31@gmail.com
+Bug-Reference-ID:	CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html
+
+Bug-Description:
+
+Reading history entries with timestamps can result in history entries joined
+by linefeeds.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/lib/readline/histfile.c	2018-06-11 09:14:52.000000000 -0400
+--- lib/readline/histfile.c	2019-05-16 15:55:57.000000000 -0400
+***************
+*** 370,376 ****
+  
+    has_timestamps = HIST_TIMESTAMP_START (buffer);
+!   history_multiline_entries += has_timestamps && history_write_timestamps;  
+  
+    /* Skip lines until we are at FROM. */
+    for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+      if (*line_end == '\n')
+--- 370,378 ----
+  
+    has_timestamps = HIST_TIMESTAMP_START (buffer);
+!   history_multiline_entries += has_timestamps && history_write_timestamps;
+  
+    /* Skip lines until we are at FROM. */
++   if (has_timestamps)
++     last_ts = buffer;
+    for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+      if (*line_end == '\n')
+***************
+*** 381,385 ****
+--- 383,398 ----
+  	if (HIST_TIMESTAMP_START(p) == 0)
+  	  current_line++;
++ 	else
++ 	  last_ts = p;
+  	line_start = p;
++ 	/* If we are at the last line (current_line == from) but we have
++ 	   timestamps (has_timestamps), then line_start points to the
++ 	   text of the last command, and we need to skip to its end. */
++ 	if (current_line >= from && has_timestamps)
++ 	  {
++ 	    for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++)
++ 	      ;
++ 	    line_start = (*line_end == '\n') ? line_end + 1 : line_end;
++ 	  }
+        }
+  
+
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash50-014 b/src/patches/bash/bash50-014
new file mode 100644
index 000000000..6cb49aae7
--- /dev/null
+++ b/src/patches/bash/bash50-014
@@ -0,0 +1,52 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-014
+
+Bug-Reported-by:	Johannes Hielscher jhielscher@posteo.de
+Bug-Reference-ID:	20190208205048.77c25a83@hordevm
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00032.html
+
+Bug-Description:
+
+If the current line is empty, using the emacs C-xC-e binding to enter the
+editor will edit the previous command instead of the current (empty) one.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/bashline.c	2019-01-16 16:13:21.000000000 -0500
+--- bashline.c	2019-02-11 11:18:57.000000000 -0500
+***************
+*** 962,970 ****
+  	 finished with the command, so we should not ignore the last command */
+        using_history ();
+!       if (rl_line_buffer[0])
+! 	{
+! 	  current_command_line_count++;	/* for rl_newline above */
+! 	  bash_add_history (rl_line_buffer);
+! 	}
+        current_command_line_count = 0;	/* for dummy history entry */
+        bash_add_history ("");
+--- 965,970 ----
+  	 finished with the command, so we should not ignore the last command */
+        using_history ();
+!       current_command_line_count++;	/* for rl_newline above */
+!       bash_add_history (rl_line_buffer);
+        current_command_line_count = 0;	/* for dummy history entry */
+        bash_add_history ("");
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash50-015 b/src/patches/bash/bash50-015
new file mode 100644
index 000000000..ff6e5e69d
--- /dev/null
+++ b/src/patches/bash/bash50-015
@@ -0,0 +1,78 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-015
+
+Bug-Reported-by:	Yu Kou ckyoog@gmail.com
+Bug-Reference-ID:	CAAqoF9Ko3nAShJXGzucafs-ByUagzZ4nbQonwEkwC7s9UqfWKw@mail.gmail.com
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00032.html
+
+Bug-Description:
+
+If alias expansion is enabled when processing the command argument to the
+`-c' option, an alias is defined in that command, and the command ends with
+the invocation of that alias, the shell's command parser can prematurely
+terminate before the entire command is executed.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20190426/builtins/evalstring.c	2019-01-29 14:15:19.000000000 -0500
+--- builtins/evalstring.c	2019-05-15 14:19:36.000000000 -0400
+***************
+*** 92,95 ****
+--- 92,96 ----
+  	  running_trap == 0 &&
+  	  *bash_input.location.string == '\0' &&
++ 	  parser_expanding_alias () == 0 &&
+  	  command->type == cm_simple &&
+  	  signal_is_trapped (EXIT_TRAP) == 0 &&
+***************
+*** 106,109 ****
+--- 107,111 ----
+  {
+    return (*bash_input.location.string == '\0' &&
++ 	  parser_expanding_alias () == 0 &&
+  	  (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
+  	  command->value.Connection->second->type == cm_simple);
+***************
+*** 291,295 ****
+    with_input_from_string (string, from_file);
+    clear_shell_input_line ();
+!   while (*(bash_input.location.string))
+      {
+        command = (COMMAND *)NULL;
+--- 293,297 ----
+    with_input_from_string (string, from_file);
+    clear_shell_input_line ();
+!   while (*(bash_input.location.string) || parser_expanding_alias ())
+      {
+        command = (COMMAND *)NULL;
+***************
+*** 546,550 ****
+  
+    with_input_from_string (string, from_file);
+!   while (*(bash_input.location.string))
+      {
+        command = (COMMAND *)NULL;
+--- 548,552 ----
+  
+    with_input_from_string (string, from_file);
+!   while (*(bash_input.location.string))		/* XXX - parser_expanding_alias () ? */
+      {
+        command = (COMMAND *)NULL;
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash50-016 b/src/patches/bash/bash50-016
new file mode 100644
index 000000000..87f232d7a
--- /dev/null
+++ b/src/patches/bash/bash50-016
@@ -0,0 +1,58 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-016
+
+Bug-Reported-by:	sunnycemetery@gmail.com
+Bug-Reference-ID:	20190316041534.GB22884@midnight
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-03/msg00070.html
+
+Bug-Description:
+
+Bash waits too long to reap /dev/fd process substitutions used as redirections
+with loops and group commands, which can lead to file descriptor exhaustion.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/execute_cmd.c	2019-04-19 15:46:36.000000000 -0400
+--- execute_cmd.c	2019-07-01 16:45:49.000000000 -0400
+***************
+*** 1104,1107 ****
+--- 1085,1104 ----
+        discard_unwind_frame ("internal_fifos");
+      }
++ # if defined (HAVE_DEV_FD)
++   /* Reap process substitutions at the end of loops */
++   switch (command->type)
++     {
++     case cm_while:
++     case cm_until:
++     case cm_for:
++     case cm_group:
++ #    if defined (ARITH_FOR_COMMAND)
++     case cm_arith_for:
++ #    endif
++       reap_procsubs ();
++     default:
++       break;
++     }
++ #  endif /* HAVE_DEV_FD */
+  #endif
+  
+
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash50-017 b/src/patches/bash/bash50-017
new file mode 100644
index 000000000..adfcb6a86
--- /dev/null
+++ b/src/patches/bash/bash50-017
@@ -0,0 +1,289 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-017
+
+Bug-Reported-by:	Valentin Lab valentin.lab@kalysto.org
+Bug-Reference-ID:	ab981b9c-60a5-46d0-b7e6-a6d88b80df50@kalysto.org
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2020-03/msg00062.html
+
+Bug-Description:
+
+There were cases where patch 16 reaped process substitution file descriptors
+(or FIFOs) and processes to early. This is a better fix for the problem that
+bash50-016 attempted to solve.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/subst.c	2019-08-29 11:16:49.000000000 -0400
+--- subst.c	2020-04-02 16:24:19.000000000 -0400
+***************
+*** 5337,5341 ****
+  }
+  
+! char *
+  copy_fifo_list (sizep)
+       int *sizep;
+--- 5337,5341 ----
+  }
+  
+! void *
+  copy_fifo_list (sizep)
+       int *sizep;
+***************
+*** 5343,5347 ****
+    if (sizep)
+      *sizep = 0;
+!   return (char *)NULL;
+  }
+  
+--- 5343,5347 ----
+    if (sizep)
+      *sizep = 0;
+!   return (void *)NULL;
+  }
+  
+***************
+*** 5409,5414 ****
+  	if (fifo_list[i].file)
+  	  {
+! 	    fifo_list[j].file = fifo_list[i].file;
+! 	    fifo_list[j].proc = fifo_list[i].proc;
+  	    j++;
+  	  }
+--- 5409,5419 ----
+  	if (fifo_list[i].file)
+  	  {
+! 	    if (i != j)
+! 	      {
+! 		fifo_list[j].file = fifo_list[i].file;
+! 		fifo_list[j].proc = fifo_list[i].proc;
+! 		fifo_list[i].file = (char *)NULL;
+! 		fifo_list[i].proc = 0;
+! 	      }
+  	    j++;
+  	  }
+***************
+*** 5426,5433 ****
+  void
+  close_new_fifos (list, lsize)
+!      char *list;
+       int lsize;
+  {
+    int i;
+  
+    if (list == 0)
+--- 5431,5439 ----
+  void
+  close_new_fifos (list, lsize)
+!      void *list;
+       int lsize;
+  {
+    int i;
++   char *plist;
+  
+    if (list == 0)
+***************
+*** 5437,5442 ****
+      }
+  
+!   for (i = 0; i < lsize; i++)
+!     if (list[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1)
+        unlink_fifo (i);
+  
+--- 5443,5448 ----
+      }
+  
+!   for (plist = (char *)list, i = 0; i < lsize; i++)
+!     if (plist[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1)
+        unlink_fifo (i);
+  
+***************
+*** 5560,5568 ****
+  }
+  
+! char *
+  copy_fifo_list (sizep)
+       int *sizep;
+  {
+!   char *ret;
+  
+    if (nfds == 0 || totfds == 0)
+--- 5566,5574 ----
+  }
+  
+! void *
+  copy_fifo_list (sizep)
+       int *sizep;
+  {
+!   void *ret;
+  
+    if (nfds == 0 || totfds == 0)
+***************
+*** 5570,5579 ****
+        if (sizep)
+  	*sizep = 0;
+!       return (char *)NULL;
+      }
+  
+    if (sizep)
+      *sizep = totfds;
+!   ret = (char *)xmalloc (totfds * sizeof (pid_t));
+    return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t)));
+  }
+--- 5576,5585 ----
+        if (sizep)
+  	*sizep = 0;
+!       return (void *)NULL;
+      }
+  
+    if (sizep)
+      *sizep = totfds;
+!   ret = xmalloc (totfds * sizeof (pid_t));
+    return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t)));
+  }
+***************
+*** 5648,5655 ****
+  void
+  close_new_fifos (list, lsize)
+!      char *list;
+       int lsize;
+  {
+    int i;
+  
+    if (list == 0)
+--- 5654,5662 ----
+  void
+  close_new_fifos (list, lsize)
+!      void *list;
+       int lsize;
+  {
+    int i;
++   pid_t *plist;
+  
+    if (list == 0)
+***************
+*** 5659,5664 ****
+      }
+  
+!   for (i = 0; i < lsize; i++)
+!     if (list[i] == 0 && i < totfds && dev_fd_list[i])
+        unlink_fifo (i);
+  
+--- 5666,5671 ----
+      }
+  
+!   for (plist = (pid_t *)list, i = 0; i < lsize; i++)
+!     if (plist[i] == 0 && i < totfds && dev_fd_list[i])
+        unlink_fifo (i);
+  
+*** ../bash-5.0-patched/subst.h	2018-10-21 18:46:09.000000000 -0400
+--- subst.h	2020-04-02 16:29:28.000000000 -0400
+***************
+*** 274,280 ****
+  extern void unlink_fifo __P((int));
+  
+! extern char *copy_fifo_list __P((int *));
+! extern void unlink_new_fifos __P((char *, int));
+! extern void close_new_fifos __P((char *, int));
+  
+  extern void clear_fifo_list __P((void));
+--- 274,279 ----
+  extern void unlink_fifo __P((int));
+  
+! extern void *copy_fifo_list __P((int *));
+! extern void close_new_fifos __P((void *, int));
+  
+  extern void clear_fifo_list __P((void));
+*** ../bash-5.0-patched/execute_cmd.c	2020-02-06 20:16:48.000000000 -0500
+--- execute_cmd.c	2020-04-02 17:00:10.000000000 -0400
+***************
+*** 565,569 ****
+  #if defined (PROCESS_SUBSTITUTION)
+    volatile int ofifo, nfifo, osize, saved_fifo;
+!   volatile char *ofifo_list;
+  #endif
+  
+--- 565,569 ----
+  #if defined (PROCESS_SUBSTITUTION)
+    volatile int ofifo, nfifo, osize, saved_fifo;
+!   volatile void *ofifo_list;
+  #endif
+  
+***************
+*** 751,760 ****
+  #  endif
+  
+!   if (variable_context != 0)	/* XXX - also if sourcelevel != 0? */
+      {
+        ofifo = num_fifos ();
+        ofifo_list = copy_fifo_list ((int *)&osize);
+        begin_unwind_frame ("internal_fifos");
+!       add_unwind_protect (xfree, ofifo_list);
+        saved_fifo = 1;
+      }
+--- 751,762 ----
+  #  endif
+  
+!   /* XXX - also if sourcelevel != 0? */
+!   if (variable_context != 0)
+      {
+        ofifo = num_fifos ();
+        ofifo_list = copy_fifo_list ((int *)&osize);
+        begin_unwind_frame ("internal_fifos");
+!       if (ofifo_list)
+! 	add_unwind_protect (xfree, ofifo_list);
+        saved_fifo = 1;
+      }
+***************
+*** 1100,1123 ****
+        nfifo = num_fifos ();
+        if (nfifo > ofifo)
+! 	close_new_fifos ((char *)ofifo_list, osize);
+        free ((void *)ofifo_list);
+        discard_unwind_frame ("internal_fifos");
+      }
+- # if defined (HAVE_DEV_FD)
+-   /* Reap process substitutions at the end of loops */
+-   switch (command->type)
+-     {
+-     case cm_while:
+-     case cm_until:
+-     case cm_for:
+-     case cm_group:
+- #    if defined (ARITH_FOR_COMMAND)
+-     case cm_arith_for:
+- #    endif
+-       reap_procsubs ();
+-     default:
+-       break;
+-     }
+- #  endif /* HAVE_DEV_FD */
+  #endif
+  
+--- 1102,1109 ----
+        nfifo = num_fifos ();
+        if (nfifo > ofifo)
+! 	close_new_fifos ((void *)ofifo_list, osize);
+        free ((void *)ofifo_list);
+        discard_unwind_frame ("internal_fifos");
+      }
+  #endif
+  
+
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash50-018 b/src/patches/bash/bash50-018
new file mode 100644
index 000000000..6f1b1c7ca
--- /dev/null
+++ b/src/patches/bash/bash50-018
@@ -0,0 +1,45 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-018
+
+Bug-Reported-by:	oguzismailuysal@gmail.com
+Bug-Reference-ID:
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-10/msg00098.html
+
+Bug-Description:
+
+In certain cases, bash does not perform quoted null removal on patterns
+that are used as part of word expansions such as ${parameter##pattern}, so
+empty patterns are treated as non-empty.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0.17/subst.c	2020-04-02 17:14:58.000000000 -0400
+--- subst.c	2020-07-09 15:28:19.000000000 -0400
+***************
+*** 5113,5116 ****
+--- 5113,5118 ----
+  				      (int *)NULL, (int *)NULL)
+  	     : (WORD_LIST *)0;
++   if (l)
++     word_list_remove_quoted_nulls (l);
+    pat = string_list (l);
+    dispose_words (l);
+
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch
new file mode 100644
index 000000000..95f6391be
--- /dev/null
+++ b/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch
@@ -0,0 +1,30 @@
+commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
+Author: Stefan Schantl stefan.schantl@ipfire.org
+Date:   Mon May 25 18:00:51 2020 +0200
+
+    ProviderDDNSS: Fix unhandled exception on update
+    
+    In python > 3.3 the getheader() attribute is not longer part of the
+    urllib.response response.info() object. It is part of response object
+    and so directly can be accessed.
+    
+    Fixes #12328
+    
+    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
+
+diff --git a/src/ddns/providers.py b/src/ddns/providers.py
+index f1fed22..46d8a67 100644
+--- a/src/ddns/providers.py
++++ b/src/ddns/providers.py
+@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
+ 		response = self.send_request(self.url, data=data)
+ 
+ 		# This provider sends the response code as part of the header.
+-		header = response.info()
+-
+ 		# Get status information from the header.
+-		output = header.getheader('ddnss-response')
++		output = response.getheader('ddnss-response')
+ 
+ 		# Handle success messages.
+ 		if output == "good" or output == "nochg":
diff --git a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
new file mode 100644
index 000000000..95f6391be
--- /dev/null
+++ b/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
@@ -0,0 +1,30 @@
+commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
+Author: Stefan Schantl stefan.schantl@ipfire.org
+Date:   Mon May 25 18:00:51 2020 +0200
+
+    ProviderDDNSS: Fix unhandled exception on update
+    
+    In python > 3.3 the getheader() attribute is not longer part of the
+    urllib.response response.info() object. It is part of response object
+    and so directly can be accessed.
+    
+    Fixes #12328
+    
+    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
+
+diff --git a/src/ddns/providers.py b/src/ddns/providers.py
+index f1fed22..46d8a67 100644
+--- a/src/ddns/providers.py
++++ b/src/ddns/providers.py
+@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
+ 		response = self.send_request(self.url, data=data)
+ 
+ 		# This provider sends the response code as part of the header.
+-		header = response.info()
+-
+ 		# Get status information from the header.
+-		output = header.getheader('ddnss-response')
++		output = response.getheader('ddnss-response')
+ 
+ 		# Handle success messages.
+ 		if output == "good" or output == "nochg":
diff --git a/src/patches/ddns-013-duckdns-new-api.patch b/src/patches/ddns-013-duckdns-new-api.patch
new file mode 100644
index 000000000..a671bf917
--- /dev/null
+++ b/src/patches/ddns-013-duckdns-new-api.patch
@@ -0,0 +1,83 @@
+commit ebdb37245e2033b065cce5a19597be4ef1c8875c
+Author: Carl Mascott cmascott@yahoo.com
+Date:   Wed Dec 2 11:39:20 2020 +0100
+
+    DuckDNS: Update to use new API.
+    
+    The new API supports IPv6 and a token based auth.
+    
+    Reference #12415.
+    
+    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
+
+diff --git a/src/ddns/providers.py b/src/ddns/providers.py
+index 46d8a67..a1ca3f3 100644
+--- a/src/ddns/providers.py
++++ b/src/ddns/providers.py
+@@ -802,16 +802,62 @@ class DDNSProviderDtDNS(DDNSProvider):
+ 		raise DDNSUpdateError
+ 
+ 
+-class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, DDNSProvider):
++class DDNSProviderDuckDNS(DDNSProvider):
+ 	handle    = "duckdns.org"
+ 	name      = "Duck DNS"
+ 	website   = "http://www.duckdns.org/"
+-	protocols = ("ipv4",)
++	protocols = ("ipv6", "ipv4",)
+ 
+ 	# Information about the format of the request is to be found
+-	# https://www.duckdns.org/install.jsp
++	# https://www.duckdns.org/spec.jsp
++
++	url = "https://www.duckdns.org/update"
++	can_remove_records = False
++
++	def update(self):
++		# Raise an error if no auth details are given.
++		if not self.token:
++			raise DDNSConfigurationError
++
++		data =  {
++			"domains" : self.hostname,
++			"token"    : self.token,
++		}
++
++		# Check if we update an IPv4 address.
++		address4 = self.get_address("ipv4")
++		if address4:
++			data["ip"] = address4
+ 
+-	url = "https://www.duckdns.org/nic/update"
++		# Check if we update an IPv6 address.
++		address6 = self.get_address("ipv6")
++		if address6:
++			data["ipv6"] = address6
++
++		# Raise an error if no address is given.
++		if "ip" not in data and "ipv6" not in data:
++			raise DDNSConfigurationError
++
++		# Send update to the server.
++		response = self.send_request(self.url, data=data)
++
++		# Get the full response message.
++		output = response.read().decode()
++
++		# Remove all leading and trailing whitespace.
++		output = output.strip()
++
++		# Handle success messages.
++		if output == "OK":
++			return
++
++		# The provider does not give detailed information
++		# if the update fails. Only a "KO" will be sent back.
++		if output == "KO":
++			raise DDNSUpdateError
++
++		# If we got here, some other update error happened.
++		raise DDNSUpdateError
+ 
+ 
+ class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):
diff --git a/src/patches/libloc-0.9.4-upstream.patch b/src/patches/libloc-0.9.4-upstream.patch
new file mode 100644
index 000000000..a6ec1066b
--- /dev/null
+++ b/src/patches/libloc-0.9.4-upstream.patch
@@ -0,0 +1,3850 @@
+diff --git a/Makefile.am b/Makefile.am
+index a0431a6..dc594f8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -91,11 +91,14 @@ EXTRA_DIST += \
+ pkginclude_HEADERS = \
+ 	src/loc/libloc.h \
+ 	src/loc/as.h \
++	src/loc/as-list.h \
+ 	src/loc/compat.h \
+ 	src/loc/country.h \
++	src/loc/country-list.h \
+ 	src/loc/database.h \
+ 	src/loc/format.h \
+ 	src/loc/network.h \
++	src/loc/network-list.h \
+ 	src/loc/private.h \
+ 	src/loc/stringpool.h \
+ 	src/loc/resolv.h \
+@@ -107,9 +110,12 @@ lib_LTLIBRARIES = \
+ src_libloc_la_SOURCES = \
+ 	src/libloc.c \
+ 	src/as.c \
++	src/as-list.c \
+ 	src/country.c \
++	src/country-list.c \
+ 	src/database.c \
+ 	src/network.c \
++	src/network-list.c \
+ 	src/resolv.c \
+ 	src/stringpool.c \
+ 	src/writer.c
+@@ -312,6 +318,7 @@ check_PROGRAMS = \
+ 	src/test-database \
+ 	src/test-as \
+ 	src/test-network \
++	src/test-network-list \
+ 	src/test-country \
+ 	src/test-signature
+ 
+@@ -351,6 +358,15 @@ src_test_network_CFLAGS = \
+ src_test_network_LDADD = \
+ 	src/libloc.la
+ 
++src_test_network_list_SOURCES = \
++	src/test-network-list.c
++
++src_test_network_list_CFLAGS = \
++	$(TESTS_CFLAGS)
++
++src_test_network_list_LDADD = \
++	src/libloc.la
++
+ src_test_stringpool_SOURCES = \
+ 	src/test-stringpool.c
+ 
+@@ -390,7 +406,7 @@ MANPAGES_XML  = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
+ .PHONY: man
+ man: $(MANPAGES) $(MANPAGES_HTML)
+ 
+-if ENABLE_MANPAGES
++if ENABLE_MAN_PAGES
+ man_MANS = \
+ 	$(MANPAGES)
+ endif
+diff --git a/configure.ac b/configure.ac
+index 2364dfd..9eb9012 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ AC_PREREQ(2.60)
+ AC_INIT([libloc],
+-        [0.9.4],
++        [0.9.5],
+         [location@lists.ipfire.org],
+         [libloc],
+         [https://location.ipfire.org/])
+@@ -43,16 +43,16 @@ AC_PROG_MKDIR_P
+ 
+ # - man ------------------------------------------------------------------------
+ 
+-have_manpages=no
+-AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages],
++have_man_pages=no
++AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],
+ 	[do not install man pages]))
+-AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
+-AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
++AS_IF([test "x$enable_man_pages" != xno], [have_man_pages=yes])
++AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" = "xyes"])
+ 
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ 
+ AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+-if test "${have_manpages}" = "yes" && test -z "${ASCIIDOC}"; then
++if test "${have_man_pages}" = "yes" && test -z "${ASCIIDOC}"; then
+ 	AC_MSG_ERROR([Required program 'asciidoc' not found])
+ fi
+ # - debug ----------------------------------------------------------------------
+diff --git a/src/.gitignore b/src/.gitignore
+index caf80b5..3ccbdb8 100644
+--- a/src/.gitignore
++++ b/src/.gitignore
+@@ -10,5 +10,6 @@ test-libloc
+ test-database
+ test-country
+ test-network
++test-network-list
+ test-signature
+ test-stringpool
+diff --git a/src/as-list.c b/src/as-list.c
+new file mode 100644
+index 0000000..5acbb8a
+--- /dev/null
++++ b/src/as-list.c
+@@ -0,0 +1,161 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2020 IPFire Development Team info@ipfire.org
++
++	This library is free software; you can redistribute it and/or
++	modify it under the terms of the GNU Lesser General Public
++	License as published by the Free Software Foundation; either
++	version 2.1 of the License, or (at your option) any later version.
++
++	This library is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++	Lesser General Public License for more details.
++*/
++
++#include <errno.h>
++#include <stdlib.h>
++
++#include <loc/as.h>
++#include <loc/as-list.h>
++#include <loc/private.h>
++
++struct loc_as_list {
++	struct loc_ctx* ctx;
++	int refcount;
++
++	struct loc_as** elements;
++	size_t elements_size;
++
++	size_t size;
++};
++
++static int loc_as_list_grow(struct loc_as_list* list, size_t size) {
++	DEBUG(list->ctx, "Growing AS list %p by %zu to %zu\n",
++		list, size, list->elements_size + size);
++
++	struct loc_as** elements = reallocarray(list->elements,
++			list->elements_size + size, sizeof(*list->elements));
++	if (!elements)
++		return -errno;
++
++	list->elements = elements;
++	list->elements_size += size;
++
++	return 0;
++}
++
++LOC_EXPORT int loc_as_list_new(struct loc_ctx* ctx,
++		struct loc_as_list** list) {
++	struct loc_as_list* l = calloc(1, sizeof(*l));
++	if (!l)
++		return -ENOMEM;
++
++	l->ctx = loc_ref(ctx);
++	l->refcount = 1;
++
++	DEBUG(l->ctx, "AS list allocated at %p\n", l);
++	*list = l;
++
++	return 0;
++}
++
++LOC_EXPORT struct loc_as_list* loc_as_list_ref(struct loc_as_list* list) {
++	list->refcount++;
++
++	return list;
++}
++
++static void loc_as_list_free(struct loc_as_list* list) {
++	DEBUG(list->ctx, "Releasing AS list at %p\n", list);
++
++	loc_as_list_clear(list);
++
++	loc_unref(list->ctx);
++	free(list);
++}
++
++LOC_EXPORT struct loc_as_list* loc_as_list_unref(struct loc_as_list* list) {
++	if (!list)
++		return NULL;
++
++	if (--list->refcount > 0)
++		return list;
++
++	loc_as_list_free(list);
++	return NULL;
++}
++
++LOC_EXPORT size_t loc_as_list_size(struct loc_as_list* list) {
++	return list->size;
++}
++
++LOC_EXPORT int loc_as_list_empty(struct loc_as_list* list) {
++	return list->size == 0;
++}
++
++LOC_EXPORT void loc_as_list_clear(struct loc_as_list* list) {
++	if (!list->elements)
++		return;
++
++	for (unsigned int i = 0; i < list->size; i++)
++		loc_as_unref(list->elements[i]);
++
++	free(list->elements);
++	list->elements = NULL;
++	list->elements_size = 0;
++
++	list->size = 0;
++}
++
++LOC_EXPORT struct loc_as* loc_as_list_get(struct loc_as_list* list, size_t index) {
++	// Check index
++	if (index >= list->size)
++		return NULL;
++
++	return loc_as_ref(list->elements[index]);
++}
++
++LOC_EXPORT int loc_as_list_append(
++		struct loc_as_list* list, struct loc_as* as) {
++	if (loc_as_list_contains(list, as))
++		return 0;
++
++	// Check if we have space left
++	if (list->size >= list->elements_size) {
++		int r = loc_as_list_grow(list, 64);
++		if (r)
++			return r;
++	}
++
++	DEBUG(list->ctx, "%p: Appending AS %p to list\n", list, as);
++
++	list->elements[list->size++] = loc_as_ref(as);
++
++	return 0;
++}
++
++LOC_EXPORT int loc_as_list_contains(
++		struct loc_as_list* list, struct loc_as* as) {
++	for (unsigned int i = 0; i < list->size; i++) {
++		if (loc_as_cmp(as, list->elements[i]) == 0)
++			return 1;
++	}
++
++	return 0;
++}
++
++LOC_EXPORT int loc_as_list_contains_number(
++		struct loc_as_list* list, uint32_t number) {
++	struct loc_as* as;
++
++	int r = loc_as_new(list->ctx, &as, number);
++	if (r)
++		return -1;
++
++	r = loc_as_list_contains(list, as);
++	loc_as_unref(as);
++
++	return r;
++}
+diff --git a/src/as.c b/src/as.c
+index e1fbb01..757bf3d 100644
+--- a/src/as.c
++++ b/src/as.c
+@@ -90,7 +90,13 @@ LOC_EXPORT const char* loc_as_get_name(struct loc_as* as) {
+ }
+ 
+ LOC_EXPORT int loc_as_set_name(struct loc_as* as, const char* name) {
+-	as->name = strdup(name);
++	if (as->name)
++		free(as->name);
++
++	if (name)
++		as->name = strdup(name);
++	else
++		as->name = NULL;
+ 
+ 	return 0;
+ }
+@@ -139,6 +145,10 @@ int loc_as_match_string(struct loc_as* as, const char* string) {
+ 	if (!string)
+ 		return 1;
+ 
++	// Cannot match anything when name is not set
++	if (!as->name)
++		return 1;
++
+ 	// Search if string is in name
+ 	if (strcasestr(as->name, string) != NULL)
+ 		return 1;
+diff --git a/src/country-list.c b/src/country-list.c
+new file mode 100644
+index 0000000..cc36740
+--- /dev/null
++++ b/src/country-list.c
+@@ -0,0 +1,161 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2020 IPFire Development Team info@ipfire.org
++
++	This library is free software; you can redistribute it and/or
++	modify it under the terms of the GNU Lesser General Public
++	License as published by the Free Software Foundation; either
++	version 2.1 of the License, or (at your option) any later version.
++
++	This library is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++	Lesser General Public License for more details.
++*/
++
++#include <errno.h>
++#include <stdlib.h>
++
++#include <loc/country.h>
++#include <loc/country-list.h>
++#include <loc/private.h>
++
++struct loc_country_list {
++	struct loc_ctx* ctx;
++	int refcount;
++
++	struct loc_country** elements;
++	size_t elements_size;
++
++	size_t size;
++};
++
++static int loc_country_list_grow(struct loc_country_list* list, size_t size) {
++	DEBUG(list->ctx, "Growing country list %p by %zu to %zu\n",
++		list, size, list->elements_size + size);
++
++	struct loc_country** elements = reallocarray(list->elements,
++			list->elements_size + size, sizeof(*list->elements));
++	if (!elements)
++		return -errno;
++
++	list->elements = elements;
++	list->elements_size += size;
++
++	return 0;
++}
++
++LOC_EXPORT int loc_country_list_new(struct loc_ctx* ctx,
++		struct loc_country_list** list) {
++	struct loc_country_list* l = calloc(1, sizeof(*l));
++	if (!l)
++		return -ENOMEM;
++
++	l->ctx = loc_ref(ctx);
++	l->refcount = 1;
++
++	DEBUG(l->ctx, "Country list allocated at %p\n", l);
++	*list = l;
++
++	return 0;
++}
++
++LOC_EXPORT struct loc_country_list* loc_country_list_ref(struct loc_country_list* list) {
++	list->refcount++;
++
++	return list;
++}
++
++static void loc_country_list_free(struct loc_country_list* list) {
++	DEBUG(list->ctx, "Releasing country list at %p\n", list);
++
++	loc_country_list_clear(list);
++
++	loc_unref(list->ctx);
++	free(list);
++}
++
++LOC_EXPORT struct loc_country_list* loc_country_list_unref(struct loc_country_list* list) {
++	if (!list)
++		return NULL;
++
++	if (--list->refcount > 0)
++		return list;
++
++	loc_country_list_free(list);
++	return NULL;
++}
++
++LOC_EXPORT size_t loc_country_list_size(struct loc_country_list* list) {
++	return list->size;
++}
++
++LOC_EXPORT int loc_country_list_empty(struct loc_country_list* list) {
++	return list->size == 0;
++}
++
++LOC_EXPORT void loc_country_list_clear(struct loc_country_list* list) {
++	if (!list->elements)
++		return;
++
++	for (unsigned int i = 0; i < list->size; i++)
++		loc_country_unref(list->elements[i]);
++
++	free(list->elements);
++	list->elements = NULL;
++	list->elements_size = 0;
++
++	list->size = 0;
++}
++
++LOC_EXPORT struct loc_country* loc_country_list_get(struct loc_country_list* list, size_t index) {
++	// Check index
++	if (index >= list->size)
++		return NULL;
++
++	return loc_country_ref(list->elements[index]);
++}
++
++LOC_EXPORT int loc_country_list_append(
++		struct loc_country_list* list, struct loc_country* country) {
++	if (loc_country_list_contains(list, country))
++		return 0;
++
++	// Check if we have space left
++	if (list->size >= list->elements_size) {
++		int r = loc_country_list_grow(list, 64);
++		if (r)
++			return r;
++	}
++
++	DEBUG(list->ctx, "%p: Appending country %p to list\n", list, country);
++
++	list->elements[list->size++] = loc_country_ref(country);
++
++	return 0;
++}
++
++LOC_EXPORT int loc_country_list_contains(
++		struct loc_country_list* list, struct loc_country* country) {
++	for (unsigned int i = 0; i < list->size; i++) {
++		if (loc_country_cmp(country, list->elements[i]) == 0)
++			return 1;
++	}
++
++	return 0;
++}
++
++LOC_EXPORT int loc_country_list_contains_code(
++		struct loc_country_list* list, const char* code) {
++	struct loc_country* country;
++
++	int r = loc_country_new(list->ctx, &country, code);
++	if (r)
++		return -1;
++
++	r = loc_country_list_contains(list, country);
++	loc_country_unref(country);
++
++	return r;
++}
+diff --git a/src/country.c b/src/country.c
+index 2ba93e6..7aac0db 100644
+--- a/src/country.c
++++ b/src/country.c
+@@ -34,6 +34,9 @@ struct loc_country {
+ };
+ 
+ LOC_EXPORT int loc_country_new(struct loc_ctx* ctx, struct loc_country** country, const char* country_code) {
++	if (!loc_country_code_is_valid(country_code))
++		return -EINVAL;
++
+ 	struct loc_country* c = calloc(1, sizeof(*c));
+ 	if (!c)
+ 		return -ENOMEM;
+diff --git a/src/database.c b/src/database.c
+index fa1dad0..4b8bf1d 100644
+--- a/src/database.c
++++ b/src/database.c
+@@ -38,8 +38,10 @@
+ 
+ #include <loc/libloc.h>
+ #include <loc/as.h>
++#include <loc/as-list.h>
+ #include <loc/compat.h>
+ #include <loc/country.h>
++#include <loc/country-list.h>
+ #include <loc/database.h>
+ #include <loc/format.h>
+ #include <loc/network.h>
+@@ -99,11 +101,14 @@ struct loc_database_enumerator {
+ 
+ 	// Search string
+ 	char* string;
+-	char country_code[3];
+-	uint32_t asn;
++	struct loc_country_list* countries;
++	struct loc_as_list* asns;
+ 	enum loc_network_flags flags;
+ 	int family;
+ 
++	// Flatten output?
++	int flatten;
++
+ 	// Index of the AS we are looking at
+ 	unsigned int as_index;
+ 
+@@ -115,6 +120,9 @@ struct loc_database_enumerator {
+ 	struct loc_node_stack network_stack[MAX_STACK_DEPTH];
+ 	int network_stack_depth;
+ 	unsigned int* networks_visited;
++
++	// For subnet search
++	struct loc_network_list* stack;
+ };
+ 
+ static int loc_database_read_magic(struct loc_database* db) {
+@@ -242,11 +250,11 @@ static int loc_database_read_signature(struct loc_database* db,
+ 		char** dst, char* src, size_t length) {
+ 	// Check for a plausible signature length
+ 	if (length > LOC_SIGNATURE_MAX_LENGTH) {
+-		ERROR(db->ctx, "Signature too long: %ld\n", length);
++		ERROR(db->ctx, "Signature too long: %zu\n", length);
+ 		return -EINVAL;
+ 	}
+ 
+-	DEBUG(db->ctx, "Reading signature of %ld bytes\n", length);
++	DEBUG(db->ctx, "Reading signature of %zu bytes\n", length);
+ 
+ 	// Allocate space
+ 	*dst = malloc(length);
+@@ -611,7 +619,7 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
+ 	}
+ 
+ 	clock_t end = clock();
+-	DEBUG(db->ctx, "Signature checked in %.4fms\n",
++	INFO(db->ctx, "Signature checked in %.4fms\n",
+ 		(double)(end - start) / CLOCKS_PER_SEC * 1000);
+ 
+ CLEANUP:
+@@ -671,8 +679,10 @@ LOC_EXPORT int loc_database_get_as(struct loc_database* db, struct loc_as** as,
+ 	off_t lo = 0;
+ 	off_t hi = db->as_count - 1;
+ 
++#ifdef ENABLE_DEBUG
+ 	// Save start time
+ 	clock_t start = clock();
++#endif
+ 
+ 	while (lo <= hi) {
+ 		off_t i = (lo + hi) / 2;
+@@ -685,11 +695,13 @@ LOC_EXPORT int loc_database_get_as(struct loc_database* db, struct loc_as** as,
+ 		// Check if this is a match
+ 		uint32_t as_number = loc_as_get_number(*as);
+ 		if (as_number == number) {
++#ifdef ENABLE_DEBUG
+ 			clock_t end = clock();
+ 
+ 			// Log how fast this has been
+ 			DEBUG(db->ctx, "Found AS%u in %.4fms\n", as_number,
+ 				(double)(end - start) / CLOCKS_PER_SEC * 1000);
++#endif
+ 
+ 			return 0;
+ 		}
+@@ -733,11 +745,13 @@ static int loc_database_fetch_network(struct loc_database* db, struct loc_networ
+ 			return -1;
+ 	}
+ 
++#ifdef ENABLE_DEBUG
+ 	if (r == 0) {
+ 		char* string = loc_network_str(*network);
+ 		DEBUG(db->ctx, "Got network %s\n", string);
+ 		free(string);
+ 	}
++#endif
+ 
+ 	return r;
+ }
+@@ -762,8 +776,7 @@ static int __loc_database_lookup_handle_leaf(struct loc_database* db, const stru
+ 	}
+ 
+ 	// Check if the given IP address is inside the network
+-	r = loc_network_match_address(*network, address);
+-	if (r) {
++	if (!loc_network_match_address(*network, address)) {
+ 		DEBUG(db->ctx, "Searched address is not part of the network\n");
+ 
+ 		loc_network_unref(*network);
+@@ -832,17 +845,21 @@ LOC_EXPORT int loc_database_lookup(struct loc_database* db,
+ 
+ 	*network = NULL;
+ 
++#ifdef ENABLE_DEBUG
+ 	// Save start time
+ 	clock_t start = clock();
++#endif
+ 
+ 	int r = __loc_database_lookup(db, address, network, &network_address,
+ 		db->network_nodes_v1, 0);
+ 
++#ifdef ENABLE_DEBUG
+ 	clock_t end = clock();
+ 
+ 	// Log how fast this has been
+ 	DEBUG(db->ctx, "Executed network search in %.4fms\n",
+ 		(double)(end - start) / CLOCKS_PER_SEC * 1000);
++#endif
+ 
+ 	return r;
+ }
+@@ -889,8 +906,10 @@ LOC_EXPORT int loc_database_get_country(struct loc_database* db,
+ 	off_t lo = 0;
+ 	off_t hi = db->countries_count - 1;
+ 
++#ifdef ENABLE_DEBUG
+ 	// Save start time
+ 	clock_t start = clock();
++#endif
+ 
+ 	while (lo <= hi) {
+ 		off_t i = (lo + hi) / 2;
+@@ -905,11 +924,13 @@ LOC_EXPORT int loc_database_get_country(struct loc_database* db,
+ 		int result = strcmp(code, cc);
+ 
+ 		if (result == 0) {
++#ifdef ENABLE_DEBUG
+ 			clock_t end = clock();
+ 
+ 			// Log how fast this has been
+ 			DEBUG(db->ctx, "Found country %s in %.4fms\n", cc,
+ 				(double)(end - start) / CLOCKS_PER_SEC * 1000);
++#endif
+ 
+ 			return 0;
+ 		}
+@@ -932,8 +953,34 @@ LOC_EXPORT int loc_database_get_country(struct loc_database* db,
+ 
+ // Enumerator
+ 
++static void loc_database_enumerator_free(struct loc_database_enumerator* enumerator) {
++	DEBUG(enumerator->ctx, "Releasing database enumerator %p\n", enumerator);
++
++	// Release all references
++	loc_database_unref(enumerator->db);
++	loc_unref(enumerator->ctx);
++
++	if (enumerator->string)
++		free(enumerator->string);
++
++	if (enumerator->countries)
++		loc_country_list_unref(enumerator->countries);
++
++	if (enumerator->asns)
++		loc_as_list_unref(enumerator->asns);
++
++	// Free network search
++	free(enumerator->networks_visited);
++
++	// Free subnet stack
++	if (enumerator->stack)
++		loc_network_list_unref(enumerator->stack);
++
++	free(enumerator);
++}
++
+ LOC_EXPORT int loc_database_enumerator_new(struct loc_database_enumerator** enumerator,
+-		struct loc_database* db, enum loc_database_enumerator_mode mode) {
++		struct loc_database* db, enum loc_database_enumerator_mode mode, int flags) {
+ 	struct loc_database_enumerator* e = calloc(1, sizeof(*e));
+ 	if (!e)
+ 		return -ENOMEM;
+@@ -944,11 +991,20 @@ LOC_EXPORT int loc_database_enumerator_new(struct loc_database_enumerator** enum
+ 	e->mode = mode;
+ 	e->refcount = 1;
+ 
++	// Flatten output?
++	e->flatten = (flags & LOC_DB_ENUMERATOR_FLAGS_FLATTEN);
++
+ 	// Initialise graph search
+-	//e->network_stack[++e->network_stack_depth] = 0;
+ 	e->network_stack_depth = 1;
+ 	e->networks_visited = calloc(db->network_nodes_count, sizeof(*e->networks_visited));
+ 
++	// Allocate stack
++	int r = loc_network_list_new(e->ctx, &e->stack);
++	if (r) {
++		loc_database_enumerator_free(e);
++		return r;
++	}
++
+ 	DEBUG(e->ctx, "Database enumerator object allocated at %p\n", e);
+ 
+ 	*enumerator = e;
+@@ -961,22 +1017,6 @@ LOC_EXPORT struct loc_database_enumerator* loc_database_enumerator_ref(struct lo
+ 	return enumerator;
+ }
+ 
+-static void loc_database_enumerator_free(struct loc_database_enumerator* enumerator) {
+-	DEBUG(enumerator->ctx, "Releasing database enumerator %p\n", enumerator);
+-
+-	// Release all references
+-	loc_database_unref(enumerator->db);
+-	loc_unref(enumerator->ctx);
+-
+-	if (enumerator->string)
+-		free(enumerator->string);
+-
+-	// Free network search
+-	free(enumerator->networks_visited);
+-
+-	free(enumerator);
+-}
+-
+ LOC_EXPORT struct loc_database_enumerator* loc_database_enumerator_unref(struct loc_database_enumerator* enumerator) {
+ 	if (!enumerator)
+ 		return NULL;
+@@ -998,40 +1038,38 @@ LOC_EXPORT int loc_database_enumerator_set_string(struct loc_database_enumerator
+ 	return 0;
+ }
+ 
+-LOC_EXPORT int loc_database_enumerator_set_country_code(struct loc_database_enumerator* enumerator, const char* country_code) {
+-	// Set empty country code
+-	if (!country_code || !*country_code) {
+-		*enumerator->country_code = '\0';
+-		return 0;
+-	}
++LOC_EXPORT struct loc_country_list* loc_database_enumerator_get_countries(
++		struct loc_database_enumerator* enumerator) {
++	if (!enumerator->countries)
++		return NULL;
+ 
+-	// Treat A1, A2, A3 as special country codes,
+-	// but perform search for flags instead
+-	if (strcmp(country_code, "A1") == 0) {
+-		return loc_database_enumerator_set_flag(enumerator,
+-			LOC_NETWORK_FLAG_ANONYMOUS_PROXY);
+-	} else if (strcmp(country_code, "A2") == 0) {
+-		return loc_database_enumerator_set_flag(enumerator,
+-			LOC_NETWORK_FLAG_SATELLITE_PROVIDER);
+-	} else if (strcmp(country_code, "A3") == 0) {
+-		return loc_database_enumerator_set_flag(enumerator,
+-			LOC_NETWORK_FLAG_ANYCAST);
+-	}
++	return loc_country_list_ref(enumerator->countries);
++}
+ 
+-	// Country codes must be two characters
+-	if (!loc_country_code_is_valid(country_code))
+-		return -EINVAL;
++LOC_EXPORT int loc_database_enumerator_set_countries(
++		struct loc_database_enumerator* enumerator, struct loc_country_list* countries) {
++	if (enumerator->countries)
++		loc_country_list_unref(enumerator->countries);
+ 
+-	for (unsigned int i = 0; i < 3; i++) {
+-		enumerator->country_code[i] = country_code[i];
+-	}
++	enumerator->countries = loc_country_list_ref(countries);
+ 
+ 	return 0;
+ }
+ 
+-LOC_EXPORT int loc_database_enumerator_set_asn(
+-		struct loc_database_enumerator* enumerator, unsigned int asn) {
+-	enumerator->asn = asn;
++LOC_EXPORT struct loc_as_list* loc_database_enumerator_get_asns(
++		struct loc_database_enumerator* enumerator) {
++	if (!enumerator->asns)
++		return NULL;
++
++	return loc_as_list_ref(enumerator->asns);
++}
++
++LOC_EXPORT int loc_database_enumerator_set_asns(
++		struct loc_database_enumerator* enumerator, struct loc_as_list* asns) {
++	if (enumerator->asns)
++		loc_as_list_unref(enumerator->asns);
++
++	enumerator->asns = loc_as_list_ref(asns);
+ 
+ 	return 0;
+ }
+@@ -1110,16 +1148,64 @@ static int loc_database_enumerator_stack_push_node(
+ 	return 0;
+ }
+ 
+-LOC_EXPORT int loc_database_enumerator_next_network(
+-		struct loc_database_enumerator* enumerator, struct loc_network** network) {
+-	// Reset network
+-	*network = NULL;
++static int loc_database_enumerator_filter_network(
++		struct loc_database_enumerator* enumerator, struct loc_network* network) {
++	// Skip if the family does not match
++	if (enumerator->family && loc_network_address_family(network) != enumerator->family) {
++		DEBUG(enumerator->ctx, "Filtered network %p because of family not matching\n", network);
++		return 1;
++	}
+ 
+-	// Do not do anything if not in network mode
+-	if (enumerator->mode != LOC_DB_ENUMERATE_NETWORKS)
+-		return 0;
++	// Skip if the country code does not match
++	if (enumerator->countries && !loc_country_list_empty(enumerator->countries)) {
++		const char* country_code = loc_network_get_country_code(network);
+ 
+-	int r;
++		if (!loc_country_list_contains_code(enumerator->countries, country_code)) {
++			DEBUG(enumerator->ctx, "Filtered network %p because of country code not matching\n", network);
++			return 1;
++		}
++	}
++
++	// Skip if the ASN does not match
++	if (enumerator->asns && !loc_as_list_empty(enumerator->asns)) {
++		uint32_t asn = loc_network_get_asn(network);
++
++		if (!loc_as_list_contains_number(enumerator->asns, asn)) {
++			DEBUG(enumerator->ctx, "Filtered network %p because of ASN not matching\n", network);
++			return 1;
++		}
++	}
++
++	// Skip if flags do not match
++	if (enumerator->flags && !loc_network_match_flag(network, enumerator->flags)) {
++		DEBUG(enumerator->ctx, "Filtered network %p because of flags not matching\n", network);
++		return 1;
++	}
++
++	// Do not filter
++	return 0;
++}
++
++static int __loc_database_enumerator_next_network(
++		struct loc_database_enumerator* enumerator, struct loc_network** network, int filter) {
++	// Return top element from the stack
++	while (1) {
++		*network = loc_network_list_pop_first(enumerator->stack);
++
++		// Stack is empty
++		if (!*network)
++			break;
++
++		// Throw away any networks by filter
++		if (filter && loc_database_enumerator_filter_network(enumerator, *network)) {
++			loc_network_unref(*network);
++			*network = NULL;
++			continue;
++		}
++
++		// Return result
++		return 0;
++	}
+ 
+ 	DEBUG(enumerator->ctx, "Called with a stack of %u nodes\n",
+ 		enumerator->network_stack_depth);
+@@ -1149,7 +1235,7 @@ LOC_EXPORT int loc_database_enumerator_next_network(
+ 			enumerator->db->network_nodes_v1 + node->offset;
+ 
+ 		// Add edges to stack
+-		r = loc_database_enumerator_stack_push_node(enumerator,
++		int r = loc_database_enumerator_stack_push_node(enumerator,
+ 			be32toh(n->one), 1, node->depth + 1);
+ 
+ 		if (r)
+@@ -1175,54 +1261,142 @@ LOC_EXPORT int loc_database_enumerator_next_network(
+ 			if (r)
+ 				return r;
+ 
+-			// Check if we are interested in this network
++			// Return all networks when the filter is disabled
++			if (!filter)
++				return 0;
+ 
+-			// Skip if the family does not match
+-			if (enumerator->family && loc_network_address_family(*network) != enumerator->family) {
++			// Check if we are interested in this network
++			if (loc_database_enumerator_filter_network(enumerator, *network)) {
+ 				loc_network_unref(*network);
+ 				*network = NULL;
+ 
+ 				continue;
+ 			}
+ 
+-			// Skip if the country code does not match
+-			if (*enumerator->country_code &&
+-					!loc_network_match_country_code(*network, enumerator->country_code)) {
+-				loc_network_unref(*network);
+-				*network = NULL;
++			return 0;
++		}
++	}
+ 
+-				continue;
+-			}
++	// Reached the end of the search
++	return 0;
++}
+ 
+-			// Skip if the ASN does not match
+-			if (enumerator->asn &&
+-					!loc_network_match_asn(*network, enumerator->asn)) {
+-				loc_network_unref(*network);
+-				*network = NULL;
++static int __loc_database_enumerator_next_network_flattened(
++		struct loc_database_enumerator* enumerator, struct loc_network** network) {
++	// Fetch the next network
++	int r = __loc_database_enumerator_next_network(enumerator, network, 1);
++	if (r)
++		return r;
+ 
+-				continue;
+-			}
++	// End if we could not read another network
++	if (!*network)
++		return 0;
+ 
+-			// Skip if flags do not match
+-			if (enumerator->flags &&
+-					!loc_network_match_flag(*network, enumerator->flags)) {
+-				loc_network_unref(*network);
+-				*network = NULL;
++	struct loc_network* subnet = NULL;
++	struct loc_network_list* subnets;
+ 
+-				continue;
++	// Create a list with all subnets
++	r = loc_network_list_new(enumerator->ctx, &subnets);
++	if (r)
++		return r;
++
++	// Search all subnets from the database
++	while (1) {
++		// Fetch the next network in line
++		r = __loc_database_enumerator_next_network(enumerator, &subnet, 0);
++		if (r) {
++			loc_network_unref(subnet);
++			loc_network_list_unref(subnets);
++
++			return r;
++		}
++
++		// End if we did not receive another subnet
++		if (!subnet)
++			break;
++
++		// Collect all subnets in a list
++		if (loc_network_is_subnet(*network, subnet)) {
++			r = loc_network_list_push(subnets, subnet);
++			if (r) {
++				loc_network_unref(subnet);
++				loc_network_list_unref(subnets);
++
++				return r;
+ 			}
+ 
+-			return 0;
++			loc_network_unref(subnet);
++			continue;
++		}
++
++		// If this is not a subnet, we push it back onto the stack and break
++		r = loc_network_list_push(enumerator->stack, subnet);
++		if (r) {
++			loc_network_unref(subnet);
++			loc_network_list_unref(subnets);
++
++			return r;
+ 		}
++
++		loc_network_unref(subnet);
++		break;
+ 	}
+ 
+-	// Reached the end of the search
++	DEBUG(enumerator->ctx, "Found %zu subnet(s)\n", loc_network_list_size(subnets));
+ 
+-	// Mark all nodes as non-visited
+-	for (unsigned int i = 0; i < enumerator->db->network_nodes_count; i++)
+-		enumerator->networks_visited[i] = 0;
++	// We can abort here if the network has no subnets
++	if (loc_network_list_empty(subnets)) {
++		loc_network_list_unref(subnets);
+ 
+-	return 0;
++		return 0;
++	}
++
++	// If the network has any subnets, we will break it into smaller parts
++	// without the subnets.
++	struct loc_network_list* excluded = loc_network_exclude_list(*network, subnets);
++	if (!excluded) {
++		loc_network_list_unref(subnets);
++		return -1;
++	}
++
++	// Merge subnets onto the stack
++	r = loc_network_list_merge(enumerator->stack, subnets);
++	if (r) {
++		loc_network_list_unref(subnets);
++		loc_network_list_unref(excluded);
++
++		return r;
++	}
++
++	// Push excluded list onto the stack
++	r = loc_network_list_merge(enumerator->stack, excluded);
++	if (r) {
++		loc_network_list_unref(subnets);
++		loc_network_list_unref(excluded);
++
++		return r;
++	}
++
++	loc_network_list_unref(subnets);
++	loc_network_list_unref(excluded);
++
++	// Drop the network and restart the whole process again to pick the next network
++	loc_network_unref(*network);
++
++	return __loc_database_enumerator_next_network_flattened(enumerator, network);
++}
++
++LOC_EXPORT int loc_database_enumerator_next_network(
++		struct loc_database_enumerator* enumerator, struct loc_network** network) {
++	// Do not do anything if not in network mode
++	if (enumerator->mode != LOC_DB_ENUMERATE_NETWORKS)
++		return 0;
++
++	// Flatten output?
++	if (enumerator->flatten)
++		return __loc_database_enumerator_next_network_flattened(enumerator, network);
++
++	return __loc_database_enumerator_next_network(enumerator, network, 1);
+ }
+ 
+ LOC_EXPORT int loc_database_enumerator_next_country(
+diff --git a/src/libloc.sym b/src/libloc.sym
+index b8296eb..ee333f1 100644
+--- a/src/libloc.sym
++++ b/src/libloc.sym
+@@ -37,6 +37,18 @@ global:
+ 	loc_as_set_name;
+ 	loc_as_unref;
+ 
++	# AS List
++	loc_as_list_append;
++	loc_as_list_clear;
++	loc_as_list_contains;
++	loc_as_list_contains_number;
++	loc_as_list_empty;
++	loc_as_list_get;
++	loc_as_list_new;
++	loc_as_list_ref;
++	loc_as_list_size;
++	loc_as_list_unref;
++
+ 	# Country
+ 	loc_country_cmp;
+ 	loc_country_code_is_valid;
+@@ -49,6 +61,18 @@ global:
+ 	loc_country_set_name;
+ 	loc_country_unref;
+ 
++	# Country List
++	loc_country_list_append;
++	loc_country_list_clear;
++	loc_country_list_contains;
++	loc_country_list_contains_code;
++	loc_country_list_empty;
++	loc_country_list_get;
++	loc_country_list_new;
++	loc_country_list_ref;
++	loc_country_list_size;
++	loc_country_list_unref;
++
+ 	# Database
+ 	loc_database_add_as;
+ 	loc_database_count_as;
+@@ -66,13 +90,15 @@ global:
+ 	loc_database_verify;
+ 
+ 	# Database Enumerator
++	loc_database_enumerator_get_asns;
++	loc_database_enumerator_get_countries;
+ 	loc_database_enumerator_new;
+ 	loc_database_enumerator_next_as;
+ 	loc_database_enumerator_next_country;
+ 	loc_database_enumerator_next_network;
+ 	loc_database_enumerator_ref;
+-	loc_database_enumerator_set_asn;
+-	loc_database_enumerator_set_country_code;
++	loc_database_enumerator_set_asns;
++	loc_database_enumerator_set_countries;
+ 	loc_database_enumerator_set_family;
+ 	loc_database_enumerator_set_flag;
+ 	loc_database_enumerator_set_string;
+@@ -80,24 +106,48 @@ global:
+ 
+ 	# Network
+ 	loc_network_address_family;
++	loc_network_cmp;
++	loc_network_exclude;
++	loc_network_exclude_list;
+ 	loc_network_format_first_address;
+ 	loc_network_format_last_address;
+ 	loc_network_get_asn;
+ 	loc_network_get_country_code;
++	loc_network_get_first_address;
++	loc_network_get_last_address;
+ 	loc_network_has_flag;
+-	loc_network_is_subnet_of;
++	loc_network_is_subnet;
++	loc_network_match_address;
+ 	loc_network_match_asn;
+ 	loc_network_match_country_code;
+ 	loc_network_match_flag;
+ 	loc_network_new;
+ 	loc_network_new_from_string;
++	loc_network_overlaps;
++	loc_network_prefix;
+ 	loc_network_ref;
+ 	loc_network_set_asn;
+ 	loc_network_set_country_code;
+ 	loc_network_set_flag;
+ 	loc_network_str;
++	loc_network_subnets;
+ 	loc_network_unref;
+ 
++	# Network List
++	loc_network_list_clear;
++	loc_network_list_contains;
++	loc_network_list_dump;
++	loc_network_list_empty;
++	loc_network_list_get;
++	loc_network_list_merge;
++	loc_network_list_new;
++	loc_network_list_pop;
++	loc_network_list_pop_first;
++	loc_network_list_push;
++	loc_network_list_ref;
++	loc_network_list_size;
++	loc_network_list_unref;
++
+ 	# Writer
+ 	loc_writer_add_as;
+ 	loc_writer_add_country;
+diff --git a/src/loc/as-list.h b/src/loc/as-list.h
+new file mode 100644
+index 0000000..7b5c4e8
+--- /dev/null
++++ b/src/loc/as-list.h
+@@ -0,0 +1,41 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2017 IPFire Development Team info@ipfire.org
++
++	This library is free software; you can redistribute it and/or
++	modify it under the terms of the GNU Lesser General Public
++	License as published by the Free Software Foundation; either
++	version 2.1 of the License, or (at your option) any later version.
++
++	This library is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++	Lesser General Public License for more details.
++*/
++
++#ifndef LIBLOC_AS_LIST_H
++#define LIBLOC_AS_LIST_H
++
++#include <loc/as.h>
++#include <loc/libloc.h>
++
++struct loc_as_list;
++
++int loc_as_list_new(struct loc_ctx* ctx, struct loc_as_list** list);
++struct loc_as_list* loc_as_list_ref(struct loc_as_list* list);
++struct loc_as_list* loc_as_list_unref(struct loc_as_list* list);
++
++size_t loc_as_list_size(struct loc_as_list* list);
++int loc_as_list_empty(struct loc_as_list* list);
++void loc_as_list_clear(struct loc_as_list* list);
++
++struct loc_as* loc_as_list_get(struct loc_as_list* list, size_t index);
++int loc_as_list_append(struct loc_as_list* list, struct loc_as* as);
++
++int loc_as_list_contains(
++	struct loc_as_list* list, struct loc_as* as);
++int loc_as_list_contains_number(
++	struct loc_as_list* list, uint32_t number);
++
++#endif
+diff --git a/src/loc/country-list.h b/src/loc/country-list.h
+new file mode 100644
+index 0000000..a7f818a
+--- /dev/null
++++ b/src/loc/country-list.h
+@@ -0,0 +1,43 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2017 IPFire Development Team info@ipfire.org
++
++	This library is free software; you can redistribute it and/or
++	modify it under the terms of the GNU Lesser General Public
++	License as published by the Free Software Foundation; either
++	version 2.1 of the License, or (at your option) any later version.
++
++	This library is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++	Lesser General Public License for more details.
++*/
++
++#ifndef LIBLOC_COUNTRY_LIST_H
++#define LIBLOC_COUNTRY_LIST_H
++
++#include <stdlib.h>
++
++#include <loc/libloc.h>
++#include <loc/country.h>
++
++struct loc_country_list;
++
++int loc_country_list_new(struct loc_ctx* ctx, struct loc_country_list** list);
++struct loc_country_list* loc_country_list_ref(struct loc_country_list* list);
++struct loc_country_list* loc_country_list_unref(struct loc_country_list* list);
++
++size_t loc_country_list_size(struct loc_country_list* list);
++int loc_country_list_empty(struct loc_country_list* list);
++void loc_country_list_clear(struct loc_country_list* list);
++
++struct loc_country* loc_country_list_get(struct loc_country_list* list, size_t index);
++int loc_country_list_append(struct loc_country_list* list, struct loc_country* country);
++
++int loc_country_list_contains(
++	struct loc_country_list* list, struct loc_country* country);
++int loc_country_list_contains_code(
++	struct loc_country_list* list, const char* code);
++
++#endif
+diff --git a/src/loc/database.h b/src/loc/database.h
+index 43173dd..70801f0 100644
+--- a/src/loc/database.h
++++ b/src/loc/database.h
+@@ -25,6 +25,7 @@
+ #include <loc/network.h>
+ #include <loc/as.h>
+ #include <loc/country.h>
++#include <loc/country-list.h>
+ 
+ struct loc_database;
+ int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, FILE* f);
+@@ -55,15 +56,24 @@ enum loc_database_enumerator_mode {
+ 	LOC_DB_ENUMERATE_COUNTRIES = 3,
+ };
+ 
++enum loc_database_enumerator_flags {
++	LOC_DB_ENUMERATOR_FLAGS_FLATTEN = (1 << 0),
++};
++
+ struct loc_database_enumerator;
+ int loc_database_enumerator_new(struct loc_database_enumerator** enumerator,
+-	struct loc_database* db, enum loc_database_enumerator_mode mode);
++	struct loc_database* db, enum loc_database_enumerator_mode mode, int flags);
+ struct loc_database_enumerator* loc_database_enumerator_ref(struct loc_database_enumerator* enumerator);
+ struct loc_database_enumerator* loc_database_enumerator_unref(struct loc_database_enumerator* enumerator);
+ 
+ int loc_database_enumerator_set_string(struct loc_database_enumerator* enumerator, const char* string);
+-int loc_database_enumerator_set_country_code(struct loc_database_enumerator* enumerator, const char* country_code);
+-int loc_database_enumerator_set_asn(struct loc_database_enumerator* enumerator, unsigned int asn);
++struct loc_country_list* loc_database_enumerator_get_countries(struct loc_database_enumerator* enumerator);
++int loc_database_enumerator_set_countries(
++	struct loc_database_enumerator* enumerator, struct loc_country_list* countries);
++struct loc_as_list* loc_database_enumerator_get_asns(
++	struct loc_database_enumerator* enumerator);
++int loc_database_enumerator_set_asns(
++	struct loc_database_enumerator* enumerator, struct loc_as_list* asns);
+ int loc_database_enumerator_set_flag(struct loc_database_enumerator* enumerator, enum loc_network_flags flag);
+ int loc_database_enumerator_set_family(struct loc_database_enumerator* enumerator, int family);
+ int loc_database_enumerator_next_as(
+diff --git a/src/loc/network-list.h b/src/loc/network-list.h
+new file mode 100644
+index 0000000..bee21c4
+--- /dev/null
++++ b/src/loc/network-list.h
+@@ -0,0 +1,37 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2020 IPFire Development Team info@ipfire.org
++
++	This library is free software; you can redistribute it and/or
++	modify it under the terms of the GNU Lesser General Public
++	License as published by the Free Software Foundation; either
++	version 2.1 of the License, or (at your option) any later version.
++
++	This library is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++	Lesser General Public License for more details.
++*/
++
++#ifndef LIBLOC_NETWORK_LIST_H
++#define LIBLOC_NETWORK_LIST_H
++
++#include <loc/network.h>
++
++struct loc_network_list;
++int loc_network_list_new(struct loc_ctx* ctx, struct loc_network_list** list);
++struct loc_network_list* loc_network_list_ref(struct loc_network_list* list);
++struct loc_network_list* loc_network_list_unref(struct loc_network_list* list);
++size_t loc_network_list_size(struct loc_network_list* list);
++int loc_network_list_empty(struct loc_network_list* list);
++void loc_network_list_clear(struct loc_network_list* list);
++void loc_network_list_dump(struct loc_network_list* list);
++struct loc_network* loc_network_list_get(struct loc_network_list* list, size_t index);
++int loc_network_list_push(struct loc_network_list* list, struct loc_network* network);
++struct loc_network* loc_network_list_pop(struct loc_network_list* list);
++struct loc_network* loc_network_list_pop_first(struct loc_network_list* list);
++int loc_network_list_contains(struct loc_network_list* list, struct loc_network* network);
++int loc_network_list_merge(struct loc_network_list* self, struct loc_network_list* other);
++
++#endif
+diff --git a/src/loc/network.h b/src/loc/network.h
+index 70c3803..af3dafd 100644
+--- a/src/loc/network.h
++++ b/src/loc/network.h
+@@ -21,6 +21,7 @@
+ 
+ #include <loc/libloc.h>
+ #include <loc/format.h>
++#include <loc/network-list.h>
+ 
+ enum loc_network_flags {
+ 	LOC_NETWORK_FLAG_ANONYMOUS_PROXY    = (1 << 0), // A1
+@@ -37,8 +38,11 @@ struct loc_network* loc_network_ref(struct loc_network* network);
+ struct loc_network* loc_network_unref(struct loc_network* network);
+ char* loc_network_str(struct loc_network* network);
+ int loc_network_address_family(struct loc_network* network);
++unsigned int loc_network_prefix(struct loc_network* network);
+ 
++const struct in6_addr* loc_network_get_first_address(struct loc_network* network);
+ char* loc_network_format_first_address(struct loc_network* network);
++const struct in6_addr* loc_network_get_last_address(struct loc_network* network);
+ char* loc_network_format_last_address(struct loc_network* network);
+ int loc_network_match_address(struct loc_network* network, const struct in6_addr* address);
+ 
+@@ -54,7 +58,14 @@ int loc_network_has_flag(struct loc_network* network, uint32_t flag);
+ int loc_network_set_flag(struct loc_network* network, uint32_t flag);
+ int loc_network_match_flag(struct loc_network* network, uint32_t flag);
+ 
+-int loc_network_is_subnet_of(struct loc_network* self, struct loc_network* other);
++int loc_network_cmp(struct loc_network* self, struct loc_network* other);
++int loc_network_overlaps(struct loc_network* self, struct loc_network* other);
++int loc_network_is_subnet(struct loc_network* self, struct loc_network* other);
++int loc_network_subnets(struct loc_network* network, struct loc_network** subnet1, struct loc_network** subnet2);
++struct loc_network_list* loc_network_exclude(
++		struct loc_network* self, struct loc_network* other);
++struct loc_network_list* loc_network_exclude_list(
++		struct loc_network* network, struct loc_network_list* list);
+ 
+ #ifdef LIBLOC_PRIVATE
+ 
+diff --git a/src/network-list.c b/src/network-list.c
+new file mode 100644
+index 0000000..698d3ab
+--- /dev/null
++++ b/src/network-list.c
+@@ -0,0 +1,299 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2020 IPFire Development Team info@ipfire.org
++
++	This library is free software; you can redistribute it and/or
++	modify it under the terms of the GNU Lesser General Public
++	License as published by the Free Software Foundation; either
++	version 2.1 of the License, or (at your option) any later version.
++
++	This library is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++	Lesser General Public License for more details.
++*/
++
++#include <errno.h>
++#include <stdlib.h>
++#include <time.h>
++
++#include <loc/libloc.h>
++#include <loc/network.h>
++#include <loc/private.h>
++
++struct loc_network_list {
++	struct loc_ctx* ctx;
++	int refcount;
++
++	struct loc_network** elements;
++	size_t elements_size;
++
++	size_t size;
++};
++
++static int loc_network_list_grow(struct loc_network_list* list, size_t size) {
++	DEBUG(list->ctx, "Growing network list %p by %zu to %zu\n",
++		list, size, list->elements_size + size);
++
++	struct loc_network** elements = reallocarray(list->elements,
++			list->elements_size + size, sizeof(*list->elements));
++	if (!elements)
++		return -errno;
++
++	list->elements = elements;
++	list->elements_size += size;
++
++	return 0;
++}
++
++LOC_EXPORT int loc_network_list_new(struct loc_ctx* ctx,
++		struct loc_network_list** list) {
++	struct loc_network_list* l = calloc(1, sizeof(*l));
++	if (!l)
++		return -ENOMEM;
++
++	l->ctx = loc_ref(ctx);
++	l->refcount = 1;
++
++	DEBUG(l->ctx, "Network list allocated at %p\n", l);
++	*list = l;
++	return 0;
++}
++
++LOC_EXPORT struct loc_network_list* loc_network_list_ref(struct loc_network_list* list) {
++	list->refcount++;
++
++	return list;
++}
++
++static void loc_network_list_free(struct loc_network_list* list) {
++	DEBUG(list->ctx, "Releasing network list at %p\n", list);
++
++	// Remove all content
++	loc_network_list_clear(list);
++
++	loc_unref(list->ctx);
++	free(list);
++}
++
++LOC_EXPORT struct loc_network_list* loc_network_list_unref(struct loc_network_list* list) {
++	if (!list)
++		return NULL;
++
++	if (--list->refcount > 0)
++		return list;
++
++	loc_network_list_free(list);
++	return NULL;
++}
++
++LOC_EXPORT size_t loc_network_list_size(struct loc_network_list* list) {
++	return list->size;
++}
++
++LOC_EXPORT int loc_network_list_empty(struct loc_network_list* list) {
++	return list->size == 0;
++}
++
++LOC_EXPORT void loc_network_list_clear(struct loc_network_list* list) {
++	if (!list->elements)
++		return;
++
++	for (unsigned int i = 0; i < list->size; i++)
++		loc_network_unref(list->elements[i]);
++
++	free(list->elements);
++	list->elements = NULL;
++	list->elements_size = 0;
++
++	list->size = 0;
++}
++
++LOC_EXPORT void loc_network_list_dump(struct loc_network_list* list) {
++	struct loc_network* network;
++	char* s;
++
++	for (unsigned int i = 0; i < list->size; i++) {
++		network = list->elements[i];
++
++		s = loc_network_str(network);
++
++		INFO(list->ctx, "%4d: %s\n", i, s);
++		free(s);
++	}
++}
++
++LOC_EXPORT struct loc_network* loc_network_list_get(struct loc_network_list* list, size_t index) {
++	// Check index
++	if (index >= list->size)
++		return NULL;
++
++	return loc_network_ref(list->elements[index]);
++}
++
++static off_t loc_network_list_find(struct loc_network_list* list,
++		struct loc_network* network, int* found) {
++	// Insert at the beginning for an empty list
++	if (loc_network_list_empty(list))
++		return 0;
++
++	off_t lo = 0;
++	off_t hi = list->size - 1;
++	int result;
++
++	// Since we are working on an ordered list, there is often a good chance that
++	// the network we are looking for is at the end or has to go to the end.
++	if (hi >= 0) {
++		result = loc_network_cmp(network, list->elements[hi]);
++
++		// Match, so we are done
++		if (result == 0) {
++			*found = 1;
++
++			return hi;
++
++		// This needs to be added after the last one
++		} else if (result > 0) {
++			*found = 0;
++
++			return hi + 1;
++		}
++	}
++
++#ifdef ENABLE_DEBUG
++	// Save start time
++	clock_t start = clock();
++#endif
++
++	off_t i = 0;
++
++	while (lo <= hi) {
++		i = (lo + hi) / 2;
++
++		// Check if this is a match
++		result = loc_network_cmp(network, list->elements[i]);
++
++		if (result == 0) {
++			*found = 1;
++
++#ifdef ENABLE_DEBUG
++			clock_t end = clock();
++
++			// Log how fast this has been
++			DEBUG(list->ctx, "Found network in %.4fms at %jd\n",
++				(double)(end - start) / CLOCKS_PER_SEC * 1000, (intmax_t)i);
++#endif
++
++			return i;
++		}
++
++		if (result > 0) {
++			lo = i + 1;
++			i++;
++		} else {
++			hi = i - 1;
++		}
++	}
++
++	*found = 0;
++
++#ifdef ENABLE_DEBUG
++	clock_t end = clock();
++
++	// Log how fast this has been
++	DEBUG(list->ctx, "Did not find network in %.4fms (last i = %jd)\n",
++		(double)(end - start) / CLOCKS_PER_SEC * 1000, (intmax_t)i);
++#endif
++
++	return i;
++}
++
++LOC_EXPORT int loc_network_list_push(struct loc_network_list* list, struct loc_network* network) {
++	int found = 0;
++
++	off_t index = loc_network_list_find(list, network, &found);
++
++	// The network has been found on the list. Nothing to do.
++	if (found)
++		return 0;
++
++	DEBUG(list->ctx, "%p: Inserting network %p at index %jd\n",
++		list, network, (intmax_t)index);
++
++	// Check if we have space left
++	if (list->size >= list->elements_size) {
++		int r = loc_network_list_grow(list, 64);
++		if (r)
++			return r;
++	}
++
++	// The list is now larger
++	list->size++;
++
++	// Move all elements out of the way
++	for (unsigned int i = list->size - 1; i > index; i--)
++		list->elements[i] = list->elements[i - 1];
++
++	// Add the new element at the right place
++	list->elements[index] = loc_network_ref(network);
++
++	return 0;
++}
++
++LOC_EXPORT struct loc_network* loc_network_list_pop(struct loc_network_list* list) {
++	// Return nothing when empty
++	if (loc_network_list_empty(list)) {
++		DEBUG(list->ctx, "%p: Popped empty stack\n", list);
++		return NULL;
++	}
++
++	struct loc_network* network = list->elements[--list->size];
++
++	DEBUG(list->ctx, "%p: Popping network %p from stack\n", list, network);
++
++	return network;
++}
++
++LOC_EXPORT struct loc_network* loc_network_list_pop_first(struct loc_network_list* list) {
++	// Return nothing when empty
++	if (loc_network_list_empty(list)) {
++		DEBUG(list->ctx, "%p: Popped empty stack\n", list);
++		return NULL;
++	}
++
++	struct loc_network* network = list->elements[0];
++
++	// Move all elements to the top of the stack
++	for (unsigned int i = 0; i < list->size - 1; i++) {
++		list->elements[i] = list->elements[i+1];
++	}
++
++	// The list is shorter now
++	--list->size;
++
++	DEBUG(list->ctx, "%p: Popping network %p from stack\n", list, network);
++
++	return network;
++}
++
++LOC_EXPORT int loc_network_list_contains(struct loc_network_list* list, struct loc_network* network) {
++	int found = 0;
++
++	loc_network_list_find(list, network, &found);
++
++	return found;
++}
++
++LOC_EXPORT int loc_network_list_merge(
++		struct loc_network_list* self, struct loc_network_list* other) {
++	int r;
++
++	for (unsigned int i = 0; i < other->size; i++) {
++		r = loc_network_list_push(self, other->elements[i]);
++		if (r)
++			return r;
++	}
++
++	return 0;
++}
+diff --git a/src/network.c b/src/network.c
+index 366caa2..a6b679c 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -29,6 +29,7 @@
+ #include <loc/compat.h>
+ #include <loc/country.h>
+ #include <loc/network.h>
++#include <loc/network-list.h>
+ #include <loc/private.h>
+ 
+ struct loc_network {
+@@ -97,6 +98,21 @@ static struct in6_addr make_last_address(const struct in6_addr* address, const s
+ 	return a;
+ }
+ 
++static struct in6_addr address_increment(const struct in6_addr* address) {
++	struct in6_addr a = *address;
++
++	for (int octet = 15; octet >= 0; octet--) {
++		if (a.s6_addr[octet] < 255) {
++			a.s6_addr[octet]++;
++			break;
++		} else {
++			a.s6_addr[octet] = 0;
++		}
++	}
++
++	return a;
++}
++
+ LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network,
+ 		struct in6_addr* address, unsigned int prefix) {
+ 	// Address cannot be unspecified
+@@ -160,9 +176,11 @@ LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network
+ LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx, struct loc_network** network,
+ 		const char* address_string) {
+ 	struct in6_addr first_address;
+-	unsigned int prefix = 0;
+ 	char* prefix_string;
+-	int r = 1;
++	unsigned int prefix = 128;
++	int r = -EINVAL;
++
++	DEBUG(ctx, "Attempting to parse network %s\n", address_string);
+ 
+ 	// Make a copy of the string to work on it
+ 	char* buffer = strdup(address_string);
+@@ -171,29 +189,40 @@ LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx, struct loc_netwo
+ 	// Split address and prefix
+ 	address_string = strsep(&prefix_string, "/");
+ 
+-	// Did we find a prefix?
++	DEBUG(ctx, "  Split into address = %s, prefix = %s\n", address_string, prefix_string);
++
++	// Parse the address
++	r = loc_parse_address(ctx, address_string, &first_address);
++	if (r) {
++		DEBUG(ctx, "The address could not be parsed\n");
++		goto FAIL;
++	}
++
++	// If a prefix was given, we will try to parse it
+ 	if (prefix_string) {
+ 		// Convert prefix to integer
+ 		prefix = strtol(prefix_string, NULL, 10);
+ 
+-		if (prefix) {
+-			// Parse the address
+-			r = loc_parse_address(ctx, address_string, &first_address);
+-
+-			// Map the prefix to IPv6 if needed
+-			if (IN6_IS_ADDR_V4MAPPED(&first_address))
+-				prefix += 96;
++		if (!prefix) {
++			DEBUG(ctx, "The prefix was not parsable: %s\n", prefix_string);
++			goto FAIL;
+ 		}
++
++		// Map the prefix to IPv6 if needed
++		if (IN6_IS_ADDR_V4MAPPED(&first_address))
++			prefix += 96;
+ 	}
+ 
++FAIL:
+ 	// Free temporary buffer
+ 	free(buffer);
+ 
+-	if (r == 0) {
+-		r = loc_network_new(ctx, network, &first_address, prefix);
+-	}
++	// Exit if the parsing was unsuccessful
++	if (r)
++		return r;
+ 
+-	return r;
++	// Create a new network
++	return loc_network_new(ctx, network, &first_address, prefix);
+ }
+ 
+ LOC_EXPORT struct loc_network* loc_network_ref(struct loc_network* network) {
+@@ -281,6 +310,18 @@ LOC_EXPORT int loc_network_address_family(struct loc_network* network) {
+ 	return network->family;
+ }
+ 
++LOC_EXPORT unsigned int loc_network_prefix(struct loc_network* network) {
++	switch (network->family) {
++		case AF_INET6:
++			return network->prefix;
++
++		case AF_INET:
++			return network->prefix - 96;
++	}
++
++	return 0;
++}
++
+ static char* loc_network_format_address(struct loc_network* network, const struct in6_addr* address) {
+ 	const size_t length = INET6_ADDRSTRLEN;
+ 
+@@ -314,10 +355,18 @@ static char* loc_network_format_address(struct loc_network* network, const struc
+ 	return string;
+ }
+ 
++LOC_EXPORT const struct in6_addr* loc_network_get_first_address(struct loc_network* network) {
++	return &network->first_address;
++}
++
+ LOC_EXPORT char* loc_network_format_first_address(struct loc_network* network) {
+ 	return loc_network_format_address(network, &network->first_address);
+ }
+ 
++LOC_EXPORT const struct in6_addr* loc_network_get_last_address(struct loc_network* network) {
++	return &network->last_address;
++}
++
+ LOC_EXPORT char* loc_network_format_last_address(struct loc_network* network) {
+ 	return loc_network_format_address(network, &network->last_address);
+ }
+@@ -325,14 +374,14 @@ LOC_EXPORT char* loc_network_format_last_address(struct loc_network* network) {
+ LOC_EXPORT int loc_network_match_address(struct loc_network* network, const struct in6_addr* address) {
+ 	// Address must be larger than the start address
+ 	if (in6_addr_cmp(&network->first_address, address) > 0)
+-		return 1;
++		return 0;
+ 
+ 	// Address must be smaller than the last address
+ 	if (in6_addr_cmp(&network->last_address, address) < 0)
+-		return 1;
++		return 0;
+ 
+ 	// The address is inside this network
+-	return 0;
++	return 1;
+ }
+ 
+ LOC_EXPORT const char* loc_network_get_country_code(struct loc_network* network) {
+@@ -392,20 +441,310 @@ LOC_EXPORT int loc_network_match_flag(struct loc_network* network, uint32_t flag
+ 	return loc_network_has_flag(network, flag);
+ }
+ 
+-LOC_EXPORT int loc_network_is_subnet_of(struct loc_network* self, struct loc_network* other) {
++LOC_EXPORT int loc_network_cmp(struct loc_network* self, struct loc_network* other) {
++	// Compare address
++	int r = in6_addr_cmp(&self->first_address, &other->first_address);
++	if (r)
++		return r;
++
++	// Compare prefix
++	if (self->prefix > other->prefix)
++		return 1;
++	else if (self->prefix < other->prefix)
++		return -1;
++
++	// Both networks are equal
++	return 0;
++}
++
++LOC_EXPORT int loc_network_overlaps(struct loc_network* self, struct loc_network* other) {
++	// Either of the start addresses must be in the other subnet
++	if (loc_network_match_address(self, &other->first_address))
++		return 1;
++
++	if (loc_network_match_address(other, &self->first_address))
++		return 1;
++
++	// Or either of the end addresses is in the other subnet
++	if (loc_network_match_address(self, &other->last_address))
++		return 1;
++
++	if (loc_network_match_address(other, &self->last_address))
++		return 1;
++
++	return 0;
++}
++
++LOC_EXPORT int loc_network_is_subnet(struct loc_network* self, struct loc_network* other) {
++	// The prefix must be smaller (this avoids the more complex comparisons later)
++	if (self->prefix > other->prefix)
++		return 0;
++
+ 	// If the start address of the other network is smaller than this network,
+ 	// it cannot be a subnet.
+-	if (in6_addr_cmp(&self->first_address, &other->first_address) < 0)
++	if (in6_addr_cmp(&self->first_address, &other->first_address) > 0)
+ 		return 0;
+ 
+ 	// If the end address of the other network is greater than this network,
+ 	// it cannot be a subnet.
+-	if (in6_addr_cmp(&self->last_address, &other->last_address) > 0)
++	if (in6_addr_cmp(&self->last_address, &other->last_address) < 0)
+ 		return 0;
+ 
+ 	return 1;
+ }
+ 
++LOC_EXPORT int loc_network_subnets(struct loc_network* network,
++		struct loc_network** subnet1, struct loc_network** subnet2) {
++	int r;
++	*subnet1 = NULL;
++	*subnet2 = NULL;
++
++	// New prefix length
++	unsigned int prefix = network->prefix + 1;
++
++	// Check if the new prefix is valid
++	if (valid_prefix(&network->first_address, prefix))
++		return -1;
++
++	// Create the first half of the network
++	r = loc_network_new(network->ctx, subnet1, &network->first_address, prefix);
++	if (r)
++		return r;
++
++	// The next subnet starts after the first one
++	struct in6_addr first_address = address_increment(&(*subnet1)->last_address);
++
++	// Create the second half of the network
++	r = loc_network_new(network->ctx, subnet2, &first_address, prefix);
++	if (r)
++		return r;
++
++	// Copy country code
++	const char* country_code = loc_network_get_country_code(network);
++	if (country_code) {
++		loc_network_set_country_code(*subnet1, country_code);
++		loc_network_set_country_code(*subnet2, country_code);
++	}
++
++	// Copy ASN
++	uint32_t asn = loc_network_get_asn(network);
++	if (asn) {
++		loc_network_set_asn(*subnet1, asn);
++		loc_network_set_asn(*subnet2, asn);
++	}
++
++	// Copy flags
++	loc_network_set_flag(*subnet1, network->flags);
++	loc_network_set_flag(*subnet2, network->flags);
++
++	return 0;
++}
++
++static int __loc_network_exclude(struct loc_network* network,
++		struct loc_network* other, struct loc_network_list* list) {
++	struct loc_network* subnet1 = NULL;
++	struct loc_network* subnet2 = NULL;
++
++	int r = loc_network_subnets(network, &subnet1, &subnet2);
++	if (r)
++		goto ERROR;
++
++	if (loc_network_cmp(other, subnet1) == 0) {
++		r = loc_network_list_push(list, subnet2);
++		if (r)
++			goto ERROR;
++
++	} else if (loc_network_cmp(other, subnet2) == 0) {
++		r = loc_network_list_push(list, subnet1);
++		if (r)
++			goto ERROR;
++
++	} else  if (loc_network_is_subnet(subnet1, other)) {
++		r = loc_network_list_push(list, subnet2);
++		if (r)
++			goto ERROR;
++
++		r = __loc_network_exclude(subnet1, other, list);
++		if (r)
++			goto ERROR;
++
++	} else if (loc_network_is_subnet(subnet2, other)) {
++		r = loc_network_list_push(list, subnet1);
++		if (r)
++			goto ERROR;
++
++		r = __loc_network_exclude(subnet2, other, list);
++		if (r)
++			goto ERROR;
++
++	} else {
++		ERROR(network->ctx, "We should never get here\n");
++		r = 1;
++		goto ERROR;
++	}
++
++ERROR:
++	if (subnet1)
++		loc_network_unref(subnet1);
++
++	if (subnet2)
++		loc_network_unref(subnet2);
++
++	return r;
++}
++
++static int __loc_network_exclude_to_list(struct loc_network* self,
++		struct loc_network* other, struct loc_network_list* list) {
++	// Other must be a subnet of self
++	if (!loc_network_is_subnet(self, other)) {
++		DEBUG(self->ctx, "Network %p is not contained in network %p\n", other, self);
++
++		// Exit silently
++		return 0;
++	}
++
++	// We cannot perform this operation if both networks equal
++	if (loc_network_cmp(self, other) == 0) {
++		DEBUG(self->ctx, "Networks %p and %p are equal\n", self, other);
++
++		// Exit silently
++		return 0;
++	}
++
++	return __loc_network_exclude(self, other, list);
++}
++
++LOC_EXPORT struct loc_network_list* loc_network_exclude(
++		struct loc_network* self, struct loc_network* other) {
++	struct loc_network_list* list;
++
++#ifdef ENABLE_DEBUG
++	char* n1 = loc_network_str(self);
++	char* n2 = loc_network_str(other);
++
++	DEBUG(self->ctx, "Returning %s excluding %s...\n", n1, n2);
++
++	free(n1);
++	free(n2);
++#endif
++
++	// Create a new list with the result
++	int r = loc_network_list_new(self->ctx, &list);
++	if (r) {
++		ERROR(self->ctx, "Could not create network list: %d\n", r);
++
++		return NULL;
++	}
++
++	r = __loc_network_exclude_to_list(self, other, list);
++	if (r) {
++		loc_network_list_unref(list);
++
++		return NULL;
++	}
++
++	// Return the result
++	return list;
++}
++
++LOC_EXPORT struct loc_network_list* loc_network_exclude_list(
++		struct loc_network* network, struct loc_network_list* list) {
++	struct loc_network_list* to_check;
++
++	// Create a new list with all networks to look at
++	int r = loc_network_list_new(network->ctx, &to_check);
++	if (r)
++		return NULL;
++
++	struct loc_network* subnet = NULL;
++	struct loc_network_list* subnets = NULL;
++
++	for (unsigned int i = 0; i < loc_network_list_size(list); i++) {
++		subnet = loc_network_list_get(list, i);
++
++		// Find all excluded networks
++		if (!loc_network_list_contains(to_check, subnet)) {
++			r = __loc_network_exclude_to_list(network, subnet, to_check);
++			if (r) {
++				loc_network_list_unref(to_check);
++				loc_network_unref(subnet);
++
++				return NULL;
++			}
++		}
++
++		// Cleanup
++		loc_network_unref(subnet);
++	}
++
++	r = loc_network_list_new(network->ctx, &subnets);
++	if (r) {
++		loc_network_list_unref(to_check);
++		return NULL;
++	}
++
++	off_t smallest_subnet = 0;
++
++	while (!loc_network_list_empty(to_check)) {
++		struct loc_network* subnet_to_check = loc_network_list_pop_first(to_check);
++
++		// Check whether the subnet to check is part of the input list
++		if (loc_network_list_contains(list, subnet_to_check)) {
++			loc_network_unref(subnet_to_check);
++			continue;
++		}
++
++		// Marks whether this subnet passed all checks
++		int passed = 1;
++
++		for (unsigned int i = smallest_subnet; i < loc_network_list_size(list); i++) {
++			subnet = loc_network_list_get(list, i);
++
++			// Drop this subnet if is a subnet of another subnet
++			if (loc_network_is_subnet(subnet, subnet_to_check)) {
++				passed = 0;
++				loc_network_unref(subnet);
++				break;
++			}
++
++			// Break it down if it overlaps
++			if (loc_network_overlaps(subnet, subnet_to_check)) {
++				passed = 0;
++
++				__loc_network_exclude_to_list(subnet_to_check, subnet, to_check);
++
++				loc_network_unref(subnet);
++				break;
++			}
++
++			// If the subnet is strictly greater, we do not need to continue the search
++			r = loc_network_cmp(subnet, subnet_to_check);
++			if (r > 0) {
++				loc_network_unref(subnet);
++				break;
++
++			// If it is strictly smaller, we can continue the search from here next
++			// time because all networks that are to be checked can only be larger
++			// than this one.
++			} else if (r < 0) {
++				smallest_subnet = i;
++			}
++
++			loc_network_unref(subnet);
++		}
++
++		if (passed) {
++			r = loc_network_list_push(subnets, subnet_to_check);
++		}
++
++		loc_network_unref(subnet_to_check);
++	}
++
++	loc_network_list_unref(to_check);
++
++	return subnets;
++}
++
+ LOC_EXPORT int loc_network_to_database_v1(struct loc_network* network, struct loc_database_network_v1* dbobj) {
+ 	// Add country code
+ 	loc_country_code_copy(dbobj->country_code, network->country_code);
+@@ -474,7 +813,7 @@ struct loc_network_tree_node {
+ 	struct loc_network* network;
+ };
+ 
+-LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) {
++int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) {
+ 	struct loc_network_tree* t = calloc(1, sizeof(*t));
+ 	if (!t)
+ 		return -ENOMEM;
+@@ -494,7 +833,7 @@ LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree
+ 	return 0;
+ }
+ 
+-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) {
++struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) {
+ 	return loc_network_tree_node_ref(tree->root);
+ }
+ 
+@@ -566,7 +905,7 @@ static int __loc_network_tree_walk(struct loc_ctx* ctx, struct loc_network_tree_
+ 	return 0;
+ }
+ 
+-LOC_EXPORT int loc_network_tree_walk(struct loc_network_tree* tree,
++int loc_network_tree_walk(struct loc_network_tree* tree,
+ 		int(*filter_callback)(struct loc_network* network, void* data),
+ 		int(*callback)(struct loc_network* network, void* data), void* data) {
+ 	return __loc_network_tree_walk(tree->ctx, tree->root, filter_callback, callback, data);
+@@ -581,7 +920,7 @@ static void loc_network_tree_free(struct loc_network_tree* tree) {
+ 	free(tree);
+ }
+ 
+-LOC_EXPORT struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) {
++struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) {
+ 	if (--tree->refcount > 0)
+ 		return tree;
+ 
+@@ -602,13 +941,13 @@ static int __loc_network_tree_dump(struct loc_network* network, void* data) {
+ 	return 0;
+ }
+ 
+-LOC_EXPORT int loc_network_tree_dump(struct loc_network_tree* tree) {
++int loc_network_tree_dump(struct loc_network_tree* tree) {
+ 	DEBUG(tree->ctx, "Dumping network tree at %p\n", tree);
+ 
+ 	return loc_network_tree_walk(tree, NULL, __loc_network_tree_dump, NULL);
+ }
+ 
+-LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) {
++int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) {
+ 	DEBUG(tree->ctx, "Adding network %p to tree %p\n", network, tree);
+ 
+ 	struct loc_network_tree_node* node = loc_network_tree_get_path(tree,
+@@ -639,7 +978,7 @@ static int __loc_network_tree_count(struct loc_network* network, void* data) {
+ 	return 0;
+ }
+ 
+-LOC_EXPORT size_t loc_network_tree_count_networks(struct loc_network_tree* tree) {
++size_t loc_network_tree_count_networks(struct loc_network_tree* tree) {
+ 	size_t counter = 0;
+ 
+ 	int r = loc_network_tree_walk(tree, NULL, __loc_network_tree_count, &counter);
+@@ -661,11 +1000,11 @@ static size_t __loc_network_tree_count_nodes(struct loc_network_tree_node* node)
+ 	return counter;
+ }
+ 
+-LOC_EXPORT size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) {
++size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) {
+ 	return __loc_network_tree_count_nodes(tree->root);
+ }
+ 
+-LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) {
++int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) {
+ 	struct loc_network_tree_node* n = calloc(1, sizeof(*n));
+ 	if (!n)
+ 		return -ENOMEM;
+@@ -680,7 +1019,7 @@ LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network
+ 	return 0;
+ }
+ 
+-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) {
++struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) {
+ 	if (node)
+ 		node->refcount++;
+ 
+@@ -703,7 +1042,7 @@ static void loc_network_tree_node_free(struct loc_network_tree_node* node) {
+ 	free(node);
+ }
+ 
+-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) {
++struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) {
+ 	if (!node)
+ 		return NULL;
+ 
+@@ -714,7 +1053,7 @@ LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_
+ 	return NULL;
+ }
+ 
+-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) {
++struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) {
+ 	if (index == 0)
+ 		node = node->zero;
+ 	else
+@@ -726,10 +1065,10 @@ LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_ne
+ 	return loc_network_tree_node_ref(node);
+ }
+ 
+-LOC_EXPORT int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) {
++int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) {
+ 	return (!!node->network);
+ }
+ 
+-LOC_EXPORT struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) {
++struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) {
+ 	return loc_network_ref(node->network);
+ }
+diff --git a/src/perl/Location.xs b/src/perl/Location.xs
+index dcf3f0d..b7676d2 100644
+--- a/src/perl/Location.xs
++++ b/src/perl/Location.xs
+@@ -125,7 +125,7 @@ database_countries(db)
+ 	PPCODE:
+ 		// Create Database enumerator
+ 		struct loc_database_enumerator* enumerator;
+-		int err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_COUNTRIES);
++		int err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_COUNTRIES, 0);
+ 
+ 		if (err) {
+ 			croak("Could not create a database enumerator\n");
+diff --git a/src/python/database.c b/src/python/database.c
+index 1013a58..0aa03cc 100644
+--- a/src/python/database.c
++++ b/src/python/database.c
+@@ -17,6 +17,8 @@
+ #include <Python.h>
+ 
+ #include <loc/libloc.h>
++#include <loc/as.h>
++#include <loc/as-list.h>
+ #include <loc/database.h>
+ 
+ #include "locationmodule.h"
+@@ -207,10 +209,10 @@ static PyObject* new_database_enumerator(PyTypeObject* type, struct loc_database
+ 	return (PyObject*)self;
+ }
+ 
+-static PyObject* Database_iterate_all(DatabaseObject* self, enum loc_database_enumerator_mode what) {
++static PyObject* Database_iterate_all(DatabaseObject* self, enum loc_database_enumerator_mode what, int flags) {
+ 	struct loc_database_enumerator* enumerator;
+ 
+-	int r = loc_database_enumerator_new(&enumerator, self->db, what);
++	int r = loc_database_enumerator_new(&enumerator, self->db, what, flags);
+ 	if (r) {
+ 		PyErr_SetFromErrno(PyExc_SystemError);
+ 		return NULL;
+@@ -223,7 +225,7 @@ static PyObject* Database_iterate_all(DatabaseObject* self, enum loc_database_en
+ }
+ 
+ static PyObject* Database_ases(DatabaseObject* self) {
+-	return Database_iterate_all(self, LOC_DB_ENUMERATE_ASES);
++	return Database_iterate_all(self, LOC_DB_ENUMERATE_ASES, 0);
+ }
+ 
+ static PyObject* Database_search_as(DatabaseObject* self, PyObject* args) {
+@@ -234,7 +236,7 @@ static PyObject* Database_search_as(DatabaseObject* self, PyObject* args) {
+ 
+ 	struct loc_database_enumerator* enumerator;
+ 
+-	int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_ASES);
++	int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_ASES, 0);
+ 	if (r) {
+ 		PyErr_SetFromErrno(PyExc_SystemError);
+ 		return NULL;
+@@ -250,44 +252,142 @@ static PyObject* Database_search_as(DatabaseObject* self, PyObject* args) {
+ }
+ 
+ static PyObject* Database_networks(DatabaseObject* self) {
+-	return Database_iterate_all(self, LOC_DB_ENUMERATE_NETWORKS);
++	return Database_iterate_all(self, LOC_DB_ENUMERATE_NETWORKS, 0);
++}
++
++static PyObject* Database_networks_flattened(DatabaseObject *self) {
++	return Database_iterate_all(self, LOC_DB_ENUMERATE_NETWORKS, LOC_DB_ENUMERATOR_FLAGS_FLATTEN);
+ }
+ 
+ static PyObject* Database_search_networks(DatabaseObject* self, PyObject* args, PyObject* kwargs) {
+-	char* kwlist[] = { "country_code", "asn", "flags", "family", NULL };
+-	const char* country_code = NULL;
+-	unsigned int asn = 0;
++	char* kwlist[] = { "country_codes", "asns", "flags", "family", "flatten", NULL };
++	PyObject* country_codes = NULL;
++	PyObject* asn_list = NULL;
+ 	int flags = 0;
+ 	int family = 0;
++	int flatten = 0;
+ 
+-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|siii", kwlist, &country_code, &asn, &flags, &family))
++	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O!O!iip", kwlist,
++			&PyList_Type, &country_codes, &PyList_Type, &asn_list, &flags, &family, &flatten))
+ 		return NULL;
+ 
+ 	struct loc_database_enumerator* enumerator;
+-	int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_NETWORKS);
++	int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_NETWORKS,
++		(flatten) ? LOC_DB_ENUMERATOR_FLAGS_FLATTEN : 0);
+ 	if (r) {
+ 		PyErr_SetFromErrno(PyExc_SystemError);
+ 		return NULL;
+ 	}
+ 
+ 	// Set country code we are searching for
+-	if (country_code) {
+-		r = loc_database_enumerator_set_country_code(enumerator, country_code);
++	if (country_codes) {
++		struct loc_country_list* countries;
++		r = loc_country_list_new(loc_ctx, &countries);
++		if (r) {
++			PyErr_SetString(PyExc_SystemError, "Could not create country list");
++			return NULL;
++		}
++
++		for (int i = 0; i < PyList_Size(country_codes); i++) {
++			PyObject* item = PyList_GetItem(country_codes, i);
++
++			if (!PyUnicode_Check(item)) {
++				PyErr_SetString(PyExc_TypeError, "Country codes must be strings");
++				loc_country_list_unref(countries);
++				return NULL;
++			}
++
++			const char* country_code = PyUnicode_AsUTF8(item);
++
++			struct loc_country* country;
++			r = loc_country_new(loc_ctx, &country, country_code);
++			if (r) {
++				if (r == -EINVAL) {
++					PyErr_Format(PyExc_ValueError, "Invalid country code: %s", country_code);
++				} else {
++					PyErr_SetString(PyExc_SystemError, "Could not create country");
++				}
++
++				loc_country_list_unref(countries);
++				return NULL;
++			}
++
++			// Append it to the list
++			r = loc_country_list_append(countries, country);
++			if (r) {
++				PyErr_SetString(PyExc_SystemError, "Could not append country to the list");
++
++				loc_country_list_unref(countries);
++				loc_country_unref(country);
++				return NULL;
++			}
++
++			loc_country_unref(country);
++		}
+ 
++		r = loc_database_enumerator_set_countries(enumerator, countries);
+ 		if (r) {
+ 			PyErr_SetFromErrno(PyExc_SystemError);
++
++			loc_country_list_unref(countries);
+ 			return NULL;
+ 		}
++
++		loc_country_list_unref(countries);
+ 	}
+ 
+ 	// Set the ASN we are searching for
+-	if (asn) {
+-		r = loc_database_enumerator_set_asn(enumerator, asn);
++	if (asn_list) {
++		struct loc_as_list* asns;
++		r = loc_as_list_new(loc_ctx, &asns);
++		if (r) {
++			PyErr_SetString(PyExc_SystemError, "Could not create AS list");
++			return NULL;
++		}
++
++		for (int i = 0; i < PyList_Size(asn_list); i++) {
++			PyObject* item = PyList_GetItem(asn_list, i);
++
++			if (!PyLong_Check(item)) {
++				PyErr_SetString(PyExc_TypeError, "ASNs must be numbers");
+ 
++				loc_as_list_unref(asns);
++				return NULL;
++			}
++
++			unsigned long number = PyLong_AsLong(item);
++
++			struct loc_as* as;
++			r = loc_as_new(loc_ctx, &as, number);
++			if (r) {
++				PyErr_SetString(PyExc_SystemError, "Could not create AS");
++
++				loc_as_list_unref(asns);
++				loc_as_unref(as);
++				return NULL;
++			}
++
++			r = loc_as_list_append(asns, as);
++			if (r) {
++				PyErr_SetString(PyExc_SystemError, "Could not append AS to the list");
++
++				loc_as_list_unref(asns);
++				loc_as_unref(as);
++				return NULL;
++			}
++
++			loc_as_unref(as);
++		}
++
++		r = loc_database_enumerator_set_asns(enumerator, asns);
+ 		if (r) {
+ 			PyErr_SetFromErrno(PyExc_SystemError);
++
++			loc_as_list_unref(asns);
+ 			return NULL;
+ 		}
++
++		loc_as_list_unref(asns);
+ 	}
+ 
+ 	// Set the flags we are searching for
+@@ -317,7 +417,7 @@ static PyObject* Database_search_networks(DatabaseObject* self, PyObject* args,
+ }
+ 
+ static PyObject* Database_countries(DatabaseObject* self) {
+-	return Database_iterate_all(self, LOC_DB_ENUMERATE_COUNTRIES);
++	return Database_iterate_all(self, LOC_DB_ENUMERATE_COUNTRIES, 0);
+ }
+ 
+ static struct PyMethodDef Database_methods[] = {
+@@ -403,6 +503,13 @@ static struct PyGetSetDef Database_getsetters[] = {
+ 		NULL,
+ 		NULL,
+ 	},
++	{
++		"networks_flattened",
++		(getter)Database_networks_flattened,
++		NULL,
++		NULL,
++		NULL,
++	},
+ 	{
+ 		"vendor",
+ 		(getter)Database_get_vendor,
+diff --git a/src/python/downloader.py b/src/python/downloader.py
+index 87bbb68..05f7872 100644
+--- a/src/python/downloader.py
++++ b/src/python/downloader.py
+@@ -119,8 +119,8 @@ class Downloader(object):
+ 
+ 		headers = {}
+ 		if timestamp:
+-			headers["If-Modified-Since"] = timestamp.strftime(
+-				"%a, %d %b %Y %H:%M:%S GMT",
++			headers["If-Modified-Since"] = time.strftime(
++				"%a, %d %b %Y %H:%M:%S GMT", time.gmtime(timestamp),
+ 			)
+ 
+ 		t = tempfile.NamedTemporaryFile(dir=tmpdir, delete=False)
+@@ -195,7 +195,7 @@ class Downloader(object):
+ 		db = Database(f.name)
+ 
+ 		# Database is not recent
+-		if timestamp and db.created_at < timestamp.timestamp():
++		if timestamp and db.created_at < timestamp:
+ 			return False
+ 
+ 		log.info("Downloaded new database from %s" % (time.strftime(
+diff --git a/src/python/export.py b/src/python/export.py
+index d15c6f0..f0eae26 100644
+--- a/src/python/export.py
++++ b/src/python/export.py
+@@ -29,7 +29,7 @@ import _location
+ log = logging.getLogger("location.export")
+ log.propagate = 1
+ 
+-flags = {
++FLAGS = {
+ 	_location.NETWORK_FLAG_ANONYMOUS_PROXY    : "A1",
+ 	_location.NETWORK_FLAG_SATELLITE_PROVIDER : "A2",
+ 	_location.NETWORK_FLAG_ANYCAST            : "A3",
+@@ -39,11 +39,8 @@ class OutputWriter(object):
+ 	suffix = "networks"
+ 	mode = "w"
+ 
+-	def __init__(self, f, prefix=None, flatten=True):
+-		self.f, self.prefix, self.flatten = f, prefix, flatten
+-
+-		# The previously written network
+-		self._last_network = None
++	def __init__(self, f, prefix=None):
++		self.f, self.prefix = f, prefix
+ 
+ 		# Immediately write the header
+ 		self._write_header()
+@@ -60,18 +57,6 @@ class OutputWriter(object):
+ 	def __repr__(self):
+ 		return "<%s f=%s>" % (self.__class__.__name__, self.f)
+ 
+-	def _flatten(self, network):
+-		"""
+-			Checks if the given network needs to be written to file,
+-			or if it is a subnet of the previously written network.
+-		"""
+-		if self._last_network and network.is_subnet_of(self._last_network):
+-			return True
+-
+-		# Remember this network for the next call
+-		self._last_network = network
+-		return False
+-
+ 	def _write_header(self):
+ 		"""
+ 			The header of the file
+@@ -84,16 +69,8 @@ class OutputWriter(object):
+ 		"""
+ 		pass
+ 
+-	def _write_network(self, network):
+-		self.f.write("%s\n" % network)
+-
+ 	def write(self, network):
+-		if self.flatten and self._flatten(network):
+-			log.debug("Skipping writing network %s" % network)
+-			return
+-
+-		# Write the network to file
+-		self._write_network(network)
++		self.f.write("%s\n" % network)
+ 
+ 	def finish(self):
+ 		"""
+@@ -114,7 +91,7 @@ class IpsetOutputWriter(OutputWriter):
+ 	def _write_header(self):
+ 		self.f.write("create %s hash:net family inet hashsize 1024 maxelem 65536\n" % self.prefix)
+ 
+-	def _write_network(self, network):
++	def write(self, network):
+ 		self.f.write("add %s %s\n" % (self.prefix, network))
+ 
+ 
+@@ -130,7 +107,7 @@ class NftablesOutputWriter(OutputWriter):
+ 	def _write_footer(self):
+ 		self.f.write("}\n")
+ 
+-	def _write_network(self, network):
++	def write(self, network):
+ 		self.f.write("	%s,\n" % network)
+ 
+ 
+@@ -142,14 +119,9 @@ class XTGeoIPOutputWriter(OutputWriter):
+ 	suffix = "iv"
+ 	mode = "wb"
+ 
+-	def _write_network(self, network):
+-		for address in (network.first_address, network.last_address):
+-			# Convert this into a string of bits
+-			bytes = socket.inet_pton(
+-				network.family, address,
+-			)
+-
+-			self.f.write(bytes)
++	def write(self, network):
++		self.f.write(network._first_address)
++		self.f.write(network._last_address)
+ 
+ 
+ formats = {
+@@ -185,8 +157,14 @@ class Exporter(object):
+ 
+ 				writers[asn] = self.writer.open(filename, prefix="AS%s" % asn)
+ 
++			# Filter countries from special country codes
++			country_codes = [
++				country_code for country_code in countries if not country_code in FLAGS.values()
++			]
++
+ 			# Get all networks that match the family
+-			networks = self.db.search_networks(family=family)
++			networks = self.db.search_networks(family=family,
++				country_codes=country_codes, asns=asns, flatten=True)
+ 
+ 			# Walk through all networks
+ 			for network in networks:
+@@ -203,10 +181,10 @@ class Exporter(object):
+ 					pass
+ 
+ 				# Handle flags
+-				for flag in flags:
++				for flag in FLAGS:
+ 					if network.has_flag(flag):
+ 						# Fetch the "fake" country code
+-						country = flags[flag]
++						country = FLAGS[flag]
+ 
+ 						try:
+ 							writers[country].write(network)
+diff --git a/src/python/importer.py b/src/python/importer.py
+index f19db4b..5f46bc3 100644
+--- a/src/python/importer.py
++++ b/src/python/importer.py
+@@ -64,7 +64,7 @@ EXTENDED_SOURCES = (
+ 	"https://ftp.arin.net/pub/stats/arin/delegated-arin-extended-latest",
+ 
+ 	# Latin America and Caribbean Network Information Centre
+-	"http://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest",
++	"https://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest",
+ 
+ 	# Réseaux IP Européens
+ 	#"https://ftp.ripe.net/pub/stats/ripencc/delegated-ripencc-extended-latest",
+diff --git a/src/python/location-importer.in b/src/python/location-importer.in
+index 1467923..2dec89e 100644
+--- a/src/python/location-importer.in
++++ b/src/python/location-importer.in
+@@ -152,6 +152,7 @@ class CLI(object):
+ 					last_seen_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP);
+ 				CREATE UNIQUE INDEX IF NOT EXISTS announcements_networks ON announcements(network);
+ 				CREATE INDEX IF NOT EXISTS announcements_family ON announcements(family(network));
++				CREATE INDEX IF NOT EXISTS announcements_search ON announcements USING GIST(network inet_ops);
+ 
+ 				-- autnums
+ 				CREATE TABLE IF NOT EXISTS autnums(number bigint, name text NOT NULL);
+@@ -165,6 +166,7 @@ class CLI(object):
+ 				-- networks
+ 				CREATE TABLE IF NOT EXISTS networks(network inet, country text);
+ 				CREATE UNIQUE INDEX IF NOT EXISTS networks_network ON networks(network);
++				CREATE INDEX IF NOT EXISTS networks_family ON networks USING BTREE(family(network));
+ 				CREATE INDEX IF NOT EXISTS networks_search ON networks USING GIST(network inet_ops);
+ 
+ 				-- overrides
+@@ -188,6 +190,8 @@ class CLI(object):
+ 				);
+ 				CREATE UNIQUE INDEX IF NOT EXISTS network_overrides_network
+ 					ON network_overrides(network);
++				CREATE INDEX IF NOT EXISTS network_overrides_search
++					ON network_overrides USING GIST(network inet_ops);
+ 			""")
+ 
+ 		return db
+@@ -234,32 +238,24 @@ class CLI(object):
+ 
+ 		# Select all known networks
+ 		rows = self.db.query("""
+-			-- Get a (sorted) list of all known networks
+-			WITH known_networks AS (
+-					SELECT network FROM announcements
+-				UNION
+-					SELECT network FROM networks
+-				ORDER BY network
+-			)
+-
+ 			-- Return a list of those networks enriched with all
+ 			-- other information that we store in the database
+ 			SELECT
+-				DISTINCT ON (known_networks.network)
+-				known_networks.network AS network,
+-				announcements.autnum AS autnum,
++				DISTINCT ON (network)
++				network,
++				autnum,
+ 
+ 				-- Country
+ 				COALESCE(
+ 					(
+ 						SELECT country FROM network_overrides overrides
+-							WHERE announcements.network <<= overrides.network
++							WHERE networks.network <<= overrides.network
+ 							ORDER BY masklen(overrides.network) DESC
+ 							LIMIT 1
+ 					),
+ 					(
+ 						SELECT country FROM autnum_overrides overrides
+-							WHERE announcements.autnum = overrides.number
++							WHERE networks.autnum = overrides.number
+ 					),
+ 					networks.country
+ 				) AS country,
+@@ -268,50 +264,67 @@ class CLI(object):
+ 				COALESCE(
+ 					(
+ 						SELECT is_anonymous_proxy FROM network_overrides overrides
+-							WHERE announcements.network <<= overrides.network
++							WHERE networks.network <<= overrides.network
+ 							ORDER BY masklen(overrides.network) DESC
+ 							LIMIT 1
+ 					),
+ 					(
+ 						SELECT is_anonymous_proxy FROM autnum_overrides overrides
+-							WHERE announcements.autnum = overrides.number
++							WHERE networks.autnum = overrides.number
+ 					),
+ 					FALSE
+ 				) AS is_anonymous_proxy,
+ 				COALESCE(
+ 					(
+ 						SELECT is_satellite_provider FROM network_overrides overrides
+-							WHERE announcements.network <<= overrides.network
++							WHERE networks.network <<= overrides.network
+ 							ORDER BY masklen(overrides.network) DESC
+ 							LIMIT 1
+ 					),
+ 					(
+ 						SELECT is_satellite_provider FROM autnum_overrides overrides
+-							WHERE announcements.autnum = overrides.number
++							WHERE networks.autnum = overrides.number
+ 					),
+ 					FALSE
+ 				) AS is_satellite_provider,
+ 				COALESCE(
+ 					(
+ 						SELECT is_anycast FROM network_overrides overrides
+-							WHERE announcements.network <<= overrides.network
++							WHERE networks.network <<= overrides.network
+ 							ORDER BY masklen(overrides.network) DESC
+ 							LIMIT 1
+ 					),
+ 					(
+ 						SELECT is_anycast FROM autnum_overrides overrides
+-							WHERE announcements.autnum = overrides.number
++							WHERE networks.autnum = overrides.number
+ 					),
+ 					FALSE
+-				) AS is_anycast,
+-
+-				-- Must be part of returned values for ORDER BY clause
+-				masklen(announcements.network) AS sort_a,
+-				masklen(networks.network) AS sort_b
+-			FROM known_networks
+-				LEFT JOIN announcements ON known_networks.network <<= announcements.network
+-				LEFT JOIN networks ON known_networks.network <<= networks.network
+-			ORDER BY known_networks.network, sort_a DESC, sort_b DESC
++				) AS is_anycast
++			FROM (
++				SELECT
++					known_networks.network AS network,
++					announcements.autnum AS autnum,
++					networks.country AS country,
++
++					-- Must be part of returned values for ORDER BY clause
++					masklen(announcements.network) AS sort_a,
++					masklen(networks.network) AS sort_b
++				FROM (
++						SELECT network FROM announcements
++					UNION ALL
++						SELECT network FROM networks
++					UNION ALL
++						SELECT network FROM network_overrides
++					) known_networks
++				LEFT JOIN
++					announcements ON known_networks.network <<= announcements.network
++				LEFT JOIN
++					networks ON known_networks.network <<= networks.network
++				ORDER BY
++					known_networks.network,
++					sort_a DESC,
++					sort_b DESC
++			) networks
+ 		""")
+ 
+ 		for row in rows:
+@@ -363,6 +376,16 @@ class CLI(object):
+ 				CREATE TEMPORARY TABLE _organizations(handle text, name text NOT NULL)
+ 					ON COMMIT DROP;
+ 				CREATE UNIQUE INDEX _organizations_handle ON _organizations(handle);
++
++				CREATE TEMPORARY TABLE _rirdata(network inet NOT NULL, country text NOT NULL)
++					ON COMMIT DROP;
++				CREATE INDEX _rirdata_search ON _rirdata USING BTREE(family(network), masklen(network));
++				CREATE UNIQUE INDEX _rirdata_network ON _rirdata(network);
++			""")
++
++			# Remove all previously imported content
++			self.db.execute("""
++				TRUNCATE TABLE networks;
+ 			""")
+ 
+ 			for source in location.importer.WHOIS_SOURCES:
+@@ -370,31 +393,72 @@ class CLI(object):
+ 					for block in f:
+ 						self._parse_block(block)
+ 
++			# Process all parsed networks from every RIR we happen to have access to,
++			# insert the largest network chunks into the networks table immediately...
++			families = self.db.query("SELECT DISTINCT family(network) AS family FROM _rirdata ORDER BY family(network)")
++
++			for family in (row.family for row in families):
++				smallest = self.db.get("SELECT MIN(masklen(network)) AS prefix FROM _rirdata WHERE family(network) = %s", family)
++
++				self.db.execute("INSERT INTO networks(network, country) \
++					SELECT network, country FROM _rirdata WHERE masklen(network) = %s AND family(network) = %s", smallest.prefix, family)
++
++				# ... determine any other prefixes for this network family, ...
++				prefixes = self.db.query("SELECT DISTINCT masklen(network) AS prefix FROM _rirdata \
++					WHERE family(network) = %s ORDER BY masklen(network) ASC OFFSET 1", family)
++
++				# ... and insert networks with this prefix in case they provide additional
++				# information (i. e. subnet of a larger chunk with a different country)
++				for prefix in (row.prefix for row in prefixes):
++					self.db.execute("""
++						WITH candidates AS (
++							SELECT
++								_rirdata.network,
++								_rirdata.country
++							FROM
++								_rirdata
++							WHERE
++								family(_rirdata.network) = %s
++							AND
++								masklen(_rirdata.network) = %s
++						),
++						filtered AS (
++							SELECT
++								DISTINCT ON (c.network)
++								c.network,
++								c.country,
++								masklen(networks.network),
++								networks.country AS parent_country
++							FROM
++								candidates c
++							LEFT JOIN
++								networks
++							ON
++								c.network << networks.network
++							ORDER BY
++								c.network,
++								masklen(networks.network) DESC NULLS LAST
++						)
++						INSERT INTO
++							networks(network, country)
++						SELECT
++							network,
++							country
++						FROM
++							filtered
++						WHERE
++							parent_country IS NULL
++						OR
++							country <> parent_country
++						ON CONFLICT DO NOTHING""",
++						family, prefix,
++					)
++
+ 			self.db.execute("""
+ 				INSERT INTO autnums(number, name)
+ 					SELECT _autnums.number, _organizations.name FROM _autnums
+ 						JOIN _organizations ON _autnums.organization = _organizations.handle
+-				ON CONFLICT (number) DO UPDATE SET name = excluded.name
+-			""")
+-
+-			self.db.execute("""
+-				--- Purge any redundant entries
+-				CREATE TEMPORARY TABLE _garbage ON COMMIT DROP
+-				AS
+-				SELECT network FROM networks candidates
+-				WHERE EXISTS (
+-					SELECT FROM networks
+-					WHERE
+-						networks.network << candidates.network
+-					AND
+-						networks.country = candidates.country
+-				);
+-
+-				CREATE UNIQUE INDEX _garbage_search ON _garbage USING BTREE(network);
+-
+-				DELETE FROM networks WHERE EXISTS (
+-					SELECT FROM _garbage WHERE networks.network = _garbage.network
+-				);
++				ON CONFLICT (number) DO UPDATE SET name = excluded.name;
+ 			""")
+ 
+ 		# Download all extended sources
+@@ -405,6 +469,69 @@ class CLI(object):
+ 					for line in f:
+ 						self._parse_line(line)
+ 
++	def _check_parsed_network(self, network):
++		"""
++			Assistive function to detect and subsequently sort out parsed
++			networks from RIR data (both Whois and so-called "extended sources"),
++			which are or have...
++
++			(a) not globally routable (RFC 1918 space, et al.)
++			(b) covering a too large chunk of the IP address space (prefix length
++				is < 7 for IPv4 networks, and < 10 for IPv6)
++			(c) "0.0.0.0" or "::" as a network address
++			(d) are too small for being publicly announced (we have decided not to
++				process them at the moment, as they significantly enlarge our
++				database without providing very helpful additional information)
++
++			This unfortunately is necessary due to brain-dead clutter across
++			various RIR databases, causing mismatches and eventually disruptions.
++
++			We will return False in case a network is not suitable for adding
++			it to our database, and True otherwise.
++		"""
++
++		if not network or not (isinstance(network, ipaddress.IPv4Network) or isinstance(network, ipaddress.IPv6Network)):
++			return False
++
++		if not network.is_global:
++			log.warning("Skipping non-globally routable network: %s" % network)
++			return False
++
++		if network.version == 4:
++			if network.prefixlen < 7:
++				log.warning("Skipping too big IP chunk: %s" % network)
++				return False
++
++			if network.prefixlen > 24:
++				log.debug("Skipping network too small to be publicly announced: %s" % network)
++				return False
++
++			if str(network.network_address) == "0.0.0.0":
++				log.warning("Skipping network based on 0.0.0.0: %s" % network)
++				return False
++
++		elif network.version == 6:
++			if network.prefixlen < 10:
++				log.warning("Skipping too big IP chunk: %s" % network)
++				return False
++
++			if network.prefixlen > 48:
++				log.debug("Skipping network too small to be publicly announced: %s" % network)
++				return False
++
++			if str(network.network_address) == "::":
++				log.warning("Skipping network based on '::': %s" % network)
++				return False
++
++		else:
++			# This should not happen...
++			log.warning("Skipping network of unknown family, this should not happen: %s" % network)
++			return False
++
++		# In case we have made it here, the network is considered to
++		# be suitable for libloc consumption...
++		return True
++
+ 	def _parse_block(self, block):
+ 		# Get first line to find out what type of block this is
+ 		line = block[0]
+@@ -433,7 +560,7 @@ class CLI(object):
+ 					autnum["asn"] = m.group(2)
+ 
+ 			elif key == "org":
+-				autnum[key] = val
++				autnum[key] = val.upper()
+ 
+ 		# Skip empty objects
+ 		if not autnum:
+@@ -447,15 +574,22 @@ class CLI(object):
+ 		)
+ 
+ 	def _parse_inetnum_block(self, block):
+-		logging.debug("Parsing inetnum block:")
++		log.debug("Parsing inetnum block:")
+ 
+ 		inetnum = {}
+ 		for line in block:
+-			logging.debug(line)
++			log.debug(line)
+ 
+ 			# Split line
+ 			key, val = split_line(line)
+ 
++			# Filter any inetnum records which are only referring to IP space
++			# not managed by that specific RIR...
++			if key == "netname":
++				if re.match(r"(ERX-NETBLOCK|(AFRINIC|ARIN|LACNIC|RIPE)-CIDR-BLOCK|IANA-NETBLOCK-\d{1,3}|NON-RIPE-NCC-MANAGED-ADDRESS-BLOCK)", val.strip()):
++					log.warning("Skipping record indicating historic/orphaned data: %s" % val.strip())
++					return
++
+ 			if key == "inetnum":
+ 				start_address, delim, end_address = val.partition("-")
+ 
+@@ -467,7 +601,7 @@ class CLI(object):
+ 					start_address = ipaddress.ip_address(start_address)
+ 					end_address   = ipaddress.ip_address(end_address)
+ 				except ValueError:
+-					logging.warning("Could not parse line: %s" % line)
++					log.warning("Could not parse line: %s" % line)
+ 					return
+ 
+ 				# Set prefix to default
+@@ -484,23 +618,24 @@ class CLI(object):
+ 				inetnum[key] = val
+ 
+ 			elif key == "country":
+-				if val == "UNITED STATES":
+-					val = "US"
+-
+ 				inetnum[key] = val.upper()
+ 
+ 		# Skip empty objects
+-		if not inetnum:
++		if not inetnum or not "country" in inetnum:
++			return
++
++		# Skip objects with bogus country code 'ZZ'
++		if inetnum.get("country") == "ZZ":
++			log.warning("Skipping network with bogus country 'ZZ': %s" % \
++				(inetnum.get("inet6num") or inetnum.get("inetnum")))
+ 			return
+ 
+ 		network = ipaddress.ip_network(inetnum.get("inet6num") or inetnum.get("inetnum"), strict=False)
+ 
+-		# Bail out in case we have processed a non-public IP network
+-		if network.is_private:
+-			logging.warning("Skipping non-globally routable network: %s" % network)
++		if not self._check_parsed_network(network):
+ 			return
+ 
+-		self.db.execute("INSERT INTO networks(network, country) \
++		self.db.execute("INSERT INTO _rirdata(network, country) \
+ 			VALUES(%s, %s) ON CONFLICT (network) DO UPDATE SET country = excluded.country",
+ 			"%s" % network, inetnum.get("country"),
+ 		)
+@@ -511,7 +646,9 @@ class CLI(object):
+ 			# Split line
+ 			key, val = split_line(line)
+ 
+-			if key in ("organisation", "org-name"):
++			if key == "organisation":
++				org[key] = val.upper()
++			elif key == "org-name":
+ 				org[key] = val
+ 
+ 		# Skip empty objects
+@@ -581,6 +718,9 @@ class CLI(object):
+ 			log.warning("Invalid IP address: %s" % address)
+ 			return
+ 
++		if not self._check_parsed_network(network):
++			return
++
+ 		self.db.execute("INSERT INTO networks(network, country) \
+ 			VALUES(%s, %s) ON CONFLICT (network) DO \
+ 			UPDATE SET country = excluded.country",
+diff --git a/src/python/location.in b/src/python/location.in
+index 44ad726..b30beae 100644
+--- a/src/python/location.in
++++ b/src/python/location.in
+@@ -253,6 +253,7 @@ class CLI(object):
+ 				network = db.lookup(address)
+ 			except ValueError:
+ 				print(_("Invalid IP address: %s") % address, file=sys.stderr)
++				return 2
+ 
+ 			args = {
+ 				"address" : address,
+@@ -398,10 +399,7 @@ class CLI(object):
+ 
+ 	def handle_update(self, db, ns):
+ 		if ns.cron and db:
+-			now = datetime.datetime.utcnow()
+-
+-			# Parse the database timestamp
+-			t = datetime.datetime.utcfromtimestamp(db.created_at)
++			now = time.time()
+ 
+ 			if ns.cron == "daily":
+ 				delta = datetime.timedelta(days=1)
+@@ -410,22 +408,20 @@ class CLI(object):
+ 			elif ns.cron == "monthly":
+ 				delta = datetime.timedelta(days=30)
+ 
++			delta = delta.total_seconds()
++
+ 			# Check if the database has recently been updated
+-			if t >= (now - delta):
++			if db.created_at >= (now - delta):
+ 				log.info(
+-					_("The database has been updated recently (%s)") % \
+-						format_timedelta(now - t),
++					_("The database has been updated recently"),
+ 				)
+ 				return 3
+ 
+ 		# Fetch the timestamp we need from DNS
+ 		t = location.discover_latest_version()
+ 
+-		# Parse timestamp into datetime format
+-		timestamp = datetime.datetime.utcfromtimestamp(t) if t else None
+-
+ 		# Check the version of the local database
+-		if db and timestamp and db.created_at >= timestamp.timestamp():
++		if db and t and db.created_at >= t:
+ 			log.info("Already on the latest version")
+ 			return
+ 
+@@ -437,7 +433,7 @@ class CLI(object):
+ 
+ 		# Try downloading a new database
+ 		try:
+-			t = d.download(public_key=ns.public_key, timestamp=timestamp, tmpdir=tmpdir)
++			t = d.download(public_key=ns.public_key, timestamp=t, tmpdir=tmpdir)
+ 
+ 		# If no file could be downloaded, log a message
+ 		except FileNotFoundError as e:
+@@ -453,13 +449,7 @@ class CLI(object):
+ 
+ 		return 0
+ 
+-	def handle_verify(self, ns):
+-		try:
+-			db = location.Database(ns.database)
+-		except FileNotFoundError as e:
+-			log.error("%s: %s" % (ns.database, e))
+-			return 127
+-
++	def handle_verify(self, db, ns):
+ 		# Verify the database
+ 		with open(ns.public_key, "r") as f:
+ 			if not db.verify(f):
+diff --git a/src/python/network.c b/src/python/network.c
+index 5496d1e..5b1369d 100644
+--- a/src/python/network.c
++++ b/src/python/network.c
+@@ -17,13 +17,33 @@
+ #include <Python.h>
+ 
+ #include <errno.h>
++#include <limits.h>
+ 
+ #include <loc/libloc.h>
+ #include <loc/network.h>
++#include <loc/network-list.h>
+ 
+ #include "locationmodule.h"
+ #include "network.h"
+ 
++static PyObject* PyList_FromNetworkList(struct loc_network_list* networks) {
++	PyObject* list = PyList_New(0);
++	if (!networks)
++		return list;
++
++	while (!loc_network_list_empty(networks)) {
++		struct loc_network* network = loc_network_list_pop(networks);
++
++		PyObject* n = new_network(&NetworkType, network);
++		PyList_Append(list, n);
++
++		loc_network_unref(network);
++		Py_DECREF(n);
++	}
++
++	return list;
++}
++
+ PyObject* new_network(PyTypeObject* type, struct loc_network* network) {
+ 	NetworkObject* self = (NetworkObject*)type->tp_alloc(type, 0);
+ 	if (self) {
+@@ -114,10 +134,18 @@ static int Network_set_asn(NetworkObject* self, PyObject* value) {
+ 	long int asn = PyLong_AsLong(value);
+ 
+ 	// Check if the ASN is within the valid range
+-	if (asn <= 0 || asn > UINT32_MAX) {
++	if (asn <= 0) {
++		PyErr_Format(PyExc_ValueError, "Invalid ASN %ld", asn);
++		return -1;
++	}
++
++#if (__WORDSIZE > 32)
++	// Check whether the input was longer than 32 bit
++	if (asn > UINT32_MAX) {
+ 		PyErr_Format(PyExc_ValueError, "Invalid ASN %ld", asn);
+ 		return -1;
+ 	}
++#endif
+ 
+ 	int r = loc_network_set_asn(self->network, asn);
+ 	if (r)
+@@ -154,13 +182,28 @@ static PyObject* Network_set_flag(NetworkObject* self, PyObject* args) {
+ 	Py_RETURN_NONE;
+ }
+ 
++static PyObject* Network_exclude(NetworkObject* self, PyObject* args) {
++	NetworkObject* other = NULL;
++
++	if (!PyArg_ParseTuple(args, "O!", &NetworkType, &other))
++		return NULL;
++
++	struct loc_network_list* list = loc_network_exclude(self->network, other->network);
++
++	// Convert to Python objects
++	PyObject* obj = PyList_FromNetworkList(list);
++	loc_network_list_unref(list);
++
++	return obj;
++}
++
+ static PyObject* Network_is_subnet_of(NetworkObject* self, PyObject* args) {
+ 	NetworkObject* other = NULL;
+ 
+ 	if (!PyArg_ParseTuple(args, "O!", &NetworkType, &other))
+ 		return NULL;
+ 
+-	if (loc_network_is_subnet_of(self->network, other->network))
++	if (loc_network_is_subnet(other->network, self->network))
+ 		Py_RETURN_TRUE;
+ 
+ 	Py_RETURN_FALSE;
+@@ -181,6 +224,26 @@ static PyObject* Network_get_first_address(NetworkObject* self) {
+ 	return obj;
+ }
+ 
++static PyObject* PyBytes_FromAddress(const struct in6_addr* address6) {
++	struct in_addr address4;
++
++	// Convert IPv4 addresses to struct in_addr
++	if (IN6_IS_ADDR_V4MAPPED(address6)) {
++		address4.s_addr = address6->s6_addr32[3];
++
++		return PyBytes_FromStringAndSize((const char*)&address4, sizeof(address4));
++	}
++
++	// Return IPv6 addresses as they are
++	return PyBytes_FromStringAndSize((const char*)address6, sizeof(*address6));
++}
++
++static PyObject* Network_get__first_address(NetworkObject* self) {
++	const struct in6_addr* address = loc_network_get_first_address(self->network);
++
++	return PyBytes_FromAddress(address);
++}
++
+ static PyObject* Network_get_last_address(NetworkObject* self) {
+ 	char* address = loc_network_format_last_address(self->network);
+ 
+@@ -190,7 +253,19 @@ static PyObject* Network_get_last_address(NetworkObject* self) {
+ 	return obj;
+ }
+ 
++static PyObject* Network_get__last_address(NetworkObject* self) {
++	const struct in6_addr* address = loc_network_get_last_address(self->network);
++
++	return PyBytes_FromAddress(address);
++}
++
+ static struct PyMethodDef Network_methods[] = {
++	{
++		"exclude",
++		(PyCFunction)Network_exclude,
++		METH_VARARGS,
++		NULL,
++	},
+ 	{
+ 		"has_flag",
+ 		(PyCFunction)Network_has_flag,
+@@ -241,6 +316,13 @@ static struct PyGetSetDef Network_getsetters[] = {
+ 		NULL,
+ 		NULL,
+ 	},
++	{
++		"_first_address",
++		(getter)Network_get__first_address,
++		NULL,
++		NULL,
++		NULL,
++	},
+ 	{
+ 		"last_address",
+ 		(getter)Network_get_last_address,
+@@ -248,6 +330,13 @@ static struct PyGetSetDef Network_getsetters[] = {
+ 		NULL,
+ 		NULL,
+ 	},
++	{
++		"_last_address",
++		(getter)Network_get__last_address,
++		NULL,
++		NULL,
++		NULL,
++	},
+ 	{ NULL },
+ };
+ 
+diff --git a/src/test-as.c b/src/test-as.c
+index 839a04c..2d61675 100644
+--- a/src/test-as.c
++++ b/src/test-as.c
+@@ -95,7 +95,7 @@ int main(int argc, char** argv) {
+ 	// Enumerator
+ 
+ 	struct loc_database_enumerator* enumerator;
+-	err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_ASES);
++	err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_ASES, 0);
+ 	if (err) {
+ 		fprintf(stderr, "Could not create a database enumerator\n");
+ 		exit(EXIT_FAILURE);
+diff --git a/src/test-database.c b/src/test-database.c
+index b4a75c4..da4b11c 100644
+--- a/src/test-database.c
++++ b/src/test-database.c
+@@ -38,6 +38,14 @@ const char* DESCRIPTION =
+ 	"Maecenas ut venenatis nunc.";
+ const char* LICENSE = "CC";
+ 
++const char* networks[] = {
++	"2001:db8::/32",
++	"2001:db8:1000::/48",
++	"2001:db8:2000::/48",
++	"2001:db8:2020::/48",
++	NULL,
++};
++
+ static int attempt_to_open(struct loc_ctx* ctx, char* path) {
+ 	FILE* f = fopen(path, "r");
+ 	if (!f)
+@@ -139,6 +147,24 @@ int main(int argc, char** argv) {
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++	struct loc_network* network = NULL;
++
++	// Add some networks
++	const char** n = networks;
++	while (*n) {
++		err = loc_writer_add_network(writer, &network, *n);
++		if (err) {
++			fprintf(stderr, "Could not add network %s\n", *n);
++			exit(EXIT_FAILURE);
++		}
++
++		// Set a country
++		loc_network_set_country_code(network, "XX");
++
++		// Next one
++		n++;
++	}
++
+ 	FILE* f = tmpfile();
+ 	if (!f) {
+ 		fprintf(stderr, "Could not open file for writing: %s\n", strerror(errno));
+@@ -170,6 +196,33 @@ int main(int argc, char** argv) {
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++	// Enumerator
++	struct loc_database_enumerator* enumerator;
++	err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_NETWORKS, 0);
++	if (err) {
++		fprintf(stderr, "Could not initialise the enumerator: %d\n", err);
++		exit(EXIT_FAILURE);
++	}
++
++	// Walk through all networks
++	while (1) {
++		err = loc_database_enumerator_next_network(enumerator, &network);
++		if (err) {
++			fprintf(stderr, "Error fetching the next network: %d\n", err);
++			exit(EXIT_FAILURE);
++		}
++
++		if (!network)
++			break;
++
++		char* s = loc_network_str(network);
++		printf("Got network: %s\n", s);
++		free(s);
++	}
++
++	// Free the enumerator
++	loc_database_enumerator_unref(enumerator);
++
+ 	// Close the database
+ 	loc_database_unref(db);
+ 	loc_unref(ctx);
+diff --git a/src/test-network-list.c b/src/test-network-list.c
+new file mode 100644
+index 0000000..6f32ff7
+--- /dev/null
++++ b/src/test-network-list.c
+@@ -0,0 +1,183 @@
++/*
++	libloc - A library to determine the location of someone on the Internet
++
++	Copyright (C) 2017 IPFire Development Team info@ipfire.org
++
++	This program is free software; you can redistribute it and/or modify
++	it under the terms of the GNU General Public License as published by
++	the Free Software Foundation; either version 2 of the License, or
++	(at your option) any later version.
++
++	This program is distributed in the hope that it will be useful,
++	but WITHOUT ANY WARRANTY; without even the implied warranty of
++	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++	GNU General Public License for more details.
++*/
++
++#include <errno.h>
++#include <stdio.h>
++#include <stddef.h>
++#include <stdlib.h>
++#include <string.h>
++#include <syslog.h>
++
++#include <loc/libloc.h>
++#include <loc/network.h>
++#include <loc/network-list.h>
++
++int main(int argc, char** argv) {
++	int err;
++
++	struct loc_ctx* ctx;
++	err = loc_new(&ctx);
++	if (err < 0)
++		exit(EXIT_FAILURE);
++
++	// Enable debug logging
++	loc_set_log_priority(ctx, LOG_DEBUG);
++
++	// Create a network
++	struct loc_network* network1;
++	err = loc_network_new_from_string(ctx, &network1, "2001:db8::/32");
++	if (err) {
++		fprintf(stderr, "Could not create the network1\n");
++		exit(EXIT_FAILURE);
++	}
++
++	struct loc_network* subnet1;
++	err = loc_network_new_from_string(ctx, &subnet1, "2001:db8:a::/48");
++	if (err) {
++		fprintf(stderr, "Could not create the subnet1\n");
++		exit(EXIT_FAILURE);
++	}
++
++	struct loc_network* subnet2;
++	err = loc_network_new_from_string(ctx, &subnet2, "2001:db8:b::/48");
++	if (err) {
++		fprintf(stderr, "Could not create the subnet2\n");
++		exit(EXIT_FAILURE);
++	}
++
++	struct loc_network* subnet3;
++	err = loc_network_new_from_string(ctx, &subnet3, "2001:db8:c::/48");
++	if (err) {
++		fprintf(stderr, "Could not create the subnet3\n");
++		exit(EXIT_FAILURE);
++	}
++
++	struct loc_network* subnet4;
++	err = loc_network_new_from_string(ctx, &subnet4, "2001:db8:d::/48");
++	if (err) {
++		fprintf(stderr, "Could not create the subnet4\n");
++		exit(EXIT_FAILURE);
++	}
++
++	struct loc_network* subnet5;
++	err = loc_network_new_from_string(ctx, &subnet5, "2001:db8:e::/48");
++	if (err) {
++		fprintf(stderr, "Could not create the subnet5\n");
++		exit(EXIT_FAILURE);
++	}
++
++	struct loc_network* subnet6;
++	err = loc_network_new_from_string(ctx, &subnet6, "2001:db8:1::/48");
++	if (err) {
++		fprintf(stderr, "Could not create the subnet6\n");
++		exit(EXIT_FAILURE);
++	}
++
++	// Make a list with both subnets
++	struct loc_network_list* subnets;
++	err = loc_network_list_new(ctx, &subnets);
++	if (err) {
++		fprintf(stderr, "Could not create subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	size_t size = loc_network_list_size(subnets);
++	if (size > 0) {
++		fprintf(stderr, "The list is not empty: %zu\n", size);
++		exit(EXIT_FAILURE);
++	}
++
++	err = loc_network_list_push(subnets, subnet1);
++	if (err) {
++		fprintf(stderr, "Could not add subnet1 to subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	if (loc_network_list_empty(subnets)) {
++		fprintf(stderr, "The subnets list reports that it is empty\n");
++		exit(EXIT_FAILURE);
++	}
++
++	err = loc_network_list_push(subnets, subnet2);
++	if (err) {
++		fprintf(stderr, "Could not add subnet2 to subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	// Add the fourth one next
++	err = loc_network_list_push(subnets, subnet4);
++	if (err) {
++		fprintf(stderr, "Could not add subnet4 to subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	// Add the third one
++	err = loc_network_list_push(subnets, subnet3);
++	if (err) {
++		fprintf(stderr, "Could not add subnet3 to subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	// Add more subnets
++	err = loc_network_list_push(subnets, subnet5);
++	if (err) {
++		fprintf(stderr, "Could not add subnet5 to subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	err = loc_network_list_push(subnets, subnet6);
++	if (err) {
++		fprintf(stderr, "Could not add subnet6 to subnets list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	loc_network_list_dump(subnets);
++
++	size = loc_network_list_size(subnets);
++	if (size != 6) {
++		fprintf(stderr, "Network list is reporting an incorrect size: %zu\n", size);
++		exit(EXIT_FAILURE);
++	}
++
++	// Exclude subnet1 from network1
++	struct loc_network_list* excluded = loc_network_exclude(network1, subnet1);
++	if (!excluded) {
++		fprintf(stderr, "Received an empty result from loc_network_exclude() for subnet1\n");
++		exit(EXIT_FAILURE);
++	}
++
++	loc_network_list_dump(excluded);
++
++	// Exclude all subnets from network1
++	excluded = loc_network_exclude_list(network1, subnets);
++	if (!excluded) {
++		fprintf(stderr, "Received an empty result from loc_network_exclude() for subnets\n");
++		exit(EXIT_FAILURE);
++	}
++
++	loc_network_list_dump(excluded);
++
++	if (excluded)
++		loc_network_list_unref(excluded);
++
++	loc_network_list_unref(subnets);
++	loc_network_unref(network1);
++	loc_network_unref(subnet1);
++	loc_network_unref(subnet2);
++	loc_unref(ctx);
++
++	return EXIT_SUCCESS;
++}
+diff --git a/src/test-network.c b/src/test-network.c
+index d38f13d..dde13f1 100644
+--- a/src/test-network.c
++++ b/src/test-network.c
+@@ -14,6 +14,7 @@
+ 	GNU General Public License for more details.
+ */
+ 
++#include <arpa/inet.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -37,12 +38,21 @@ int main(int argc, char** argv) {
+ 	// Enable debug logging
+ 	loc_set_log_priority(ctx, LOG_DEBUG);
+ 
++#if 0
+ 	struct loc_network_tree* tree;
+ 	err = loc_network_tree_new(ctx, &tree);
+ 	if (err) {
+ 		fprintf(stderr, "Could not create the network tree\n");
+ 		exit(EXIT_FAILURE);
+ 	}
++#endif
++
++	struct in6_addr address;
++	err = inet_pton(AF_INET6, "2001:db8::1", &address);
++	if (err != 1) {
++		fprintf(stderr, "Could not parse IP address\n");
++		exit(EXIT_FAILURE);
++	}
+ 
+ 	// Create a network
+ 	struct loc_network* network1;
+@@ -58,12 +68,14 @@ int main(int argc, char** argv) {
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++#if 0
+ 	// Adding network to the tree
+ 	err = loc_network_tree_add_network(tree, network1);
+ 	if (err) {
+ 		fprintf(stderr, "Could not add network to the tree\n");
+ 		exit(EXIT_FAILURE);
+ 	}
++#endif
+ 
+ 	// Check if the first and last addresses are correct
+ 	char* string = loc_network_format_first_address(network1);
+@@ -88,6 +100,12 @@ int main(int argc, char** argv) {
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++	err = loc_network_match_address(network1, &address);
++	if (!err) {
++		fprintf(stderr, "Network1 does not match address\n");
++		exit(EXIT_FAILURE);
++	}
++
+ 	struct loc_network* network2;
+ 	err = loc_network_new_from_string(ctx, &network2, "2001:db8:ffff::/48");
+ 	if (err) {
+@@ -101,6 +119,7 @@ int main(int argc, char** argv) {
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++#if 0
+ 	// Adding network to the tree
+ 	err = loc_network_tree_add_network(tree, network2);
+ 	if (err) {
+@@ -117,20 +136,84 @@ int main(int argc, char** argv) {
+ 
+ 	size_t nodes = loc_network_tree_count_nodes(tree);
+ 	printf("The tree has %zu nodes\n", nodes);
++#endif
++
++	// Check equals function
++	err = loc_network_cmp(network1, network1);
++	if (err) {
++		fprintf(stderr, "Network is not equal with itself\n");
++		exit(EXIT_FAILURE);
++	}
++
++	err = loc_network_cmp(network1, network2);
++	if (!err) {
++		fprintf(stderr, "Networks equal unexpectedly\n");
++		exit(EXIT_FAILURE);
++	}
+ 
+ 	// Check subnet function
+-	err = loc_network_is_subnet_of(network1, network2);
+-	if (err != 0) {
++	err = loc_network_is_subnet(network1, network2);
++	if (!err) {
+ 		fprintf(stderr, "Subnet check 1 failed: %d\n", err);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	err = loc_network_is_subnet_of(network2, network1);
+-	if (err != 1) {
++	err = loc_network_is_subnet(network2, network1);
++	if (err) {
+ 		fprintf(stderr, "Subnet check 2 failed: %d\n", err);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++	// Make subnets
++	struct loc_network* subnet1 = NULL;
++	struct loc_network* subnet2 = NULL;
++
++	err  = loc_network_subnets(network1, &subnet1, &subnet2);
++	if (err || !subnet1 || !subnet2) {
++		fprintf(stderr, "Could not find subnets of network: %d\n", err);
++		exit(EXIT_FAILURE);
++	}
++
++	char* s = loc_network_str(subnet1);
++	printf("Received subnet1 = %s\n", s);
++	free(s);
++
++	s = loc_network_str(subnet2);
++	printf("Received subnet2 = %s\n", s);
++	free(s);
++
++	if (!loc_network_is_subnet(network1, subnet1)) {
++		fprintf(stderr, "Subnet1 is not a subnet\n");
++		exit(EXIT_FAILURE);
++	}
++
++	if (!loc_network_is_subnet(network1, subnet2)) {
++		fprintf(stderr, "Subnet2 is not a subnet\n");
++		exit(EXIT_FAILURE);
++	}
++
++	if (!loc_network_overlaps(network1, subnet1)) {
++		fprintf(stderr, "Network1 does not seem to contain subnet1\n");
++		exit(EXIT_FAILURE);
++	}
++
++	if (!loc_network_overlaps(network1, subnet2)) {
++		fprintf(stderr, "Network1 does not seem to contain subnet2\n");
++		exit(EXIT_FAILURE);
++	}
++
++	loc_network_unref(subnet1);
++	loc_network_unref(subnet2);
++
++	struct loc_network_list* excluded = loc_network_exclude(network1, network2);
++	if (!excluded) {
++		fprintf(stderr, "Could not create excluded list\n");
++		exit(EXIT_FAILURE);
++	}
++
++	loc_network_list_dump(excluded);
++	loc_network_list_unref(excluded);
++
+ 	// Create a database
+ 	struct loc_writer* writer;
+ 	err = loc_writer_new(ctx, &writer, NULL, NULL);
+@@ -160,6 +243,28 @@ int main(int argc, char** argv) {
+ 	// Set ASN
+ 	loc_network_set_asn(network4, 1024);
+ 
++	// Try adding an invalid network
++	struct loc_network* network;
++	err = loc_writer_add_network(writer, &network, "xxxx:xxxx::/32");
++	if (err != -EINVAL) {
++		fprintf(stderr, "It was possible to add an invalid network (err = %d)\n", err);
++		exit(EXIT_FAILURE);
++	}
++
++	// Try adding a single address
++	err = loc_writer_add_network(writer, &network, "2001:db8::");
++	if (err) {
++		fprintf(stderr, "It was impossible to add an single IP address (err = %d)\n", err);
++		exit(EXIT_FAILURE);
++	}
++
++	// Try adding localhost
++	err = loc_writer_add_network(writer, &network, "::1/128");
++	if (err != -EINVAL) {
++		fprintf(stderr, "It was possible to add localhost (::1/128): %d\n", err);
++		exit(EXIT_FAILURE);
++	}
++
+ 	FILE* f = tmpfile();
+ 	if (!f) {
+ 		fprintf(stderr, "Could not open file for writing: %s\n", strerror(errno));
+@@ -177,7 +282,10 @@ int main(int argc, char** argv) {
+ 	loc_network_unref(network2);
+ 	loc_network_unref(network3);
+ 	loc_network_unref(network4);
++
++#if 0
+ 	loc_network_tree_unref(tree);
++#endif
+ 
+ 	// And open it again from disk
+ 	struct loc_database* db;
+diff --git a/src/writer.c b/src/writer.c
+index 5939cff..c61a6df 100644
+--- a/src/writer.c
++++ b/src/writer.c
+@@ -147,8 +147,19 @@ static void loc_writer_free(struct loc_writer* writer) {
+ 		EVP_PKEY_free(writer->private_key2);
+ 
+ 	// Unref all AS
+-	for (unsigned int i = 0; i < writer->as_count; i++) {
+-		loc_as_unref(writer->as[i]);
++	if (writer->as) {
++		for (unsigned int i = 0; i < writer->as_count; i++) {
++			loc_as_unref(writer->as[i]);
++		}
++		free(writer->as);
++	}
++
++	// Unref all countries
++	if (writer->countries) {
++		for (unsigned int i = 0; i < writer->countries_count; i++) {
++			loc_country_unref(writer->countries[i]);
++		}
++		free(writer->countries);
+ 	}
+ 
+ 	// Release network tree
+@@ -601,7 +612,7 @@ static int loc_writer_create_signature(struct loc_writer* writer,
+ 		goto END;
+ 	}
+ 
+-	DEBUG(writer->ctx, "Successfully generated signature of %lu bytes\n", *length);
++	DEBUG(writer->ctx, "Successfully generated signature of %zu bytes\n", *length);
+ 	r = 0;
+ 
+ 	// Dump signature
diff --git a/src/patches/linux/linux-4.14_cve-2020-14386_net_packet_fix_overflow_in_tpacket_rcv.patch b/src/patches/linux/linux-4.14_cve-2020-14386_net_packet_fix_overflow_in_tpacket_rcv.patch
deleted file mode 100644
index a3eb3231f..000000000
--- a/src/patches/linux/linux-4.14_cve-2020-14386_net_packet_fix_overflow_in_tpacket_rcv.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Arne Fitzenreiter arne.fitzenreiter@ipfire.org
-
-patch based on acf69c946233259ab4d64f8869d4037a198c7f06
-From: Or Cohen orcohen@paloaltonetworks.com
-Subject: net/packet: fix overflow in tpacket_rcv
-
-Using tp_reserve to calculate netoff can overflow as
-tp_reserve is unsigned int and netoff is unsigned short.
-
-This may lead to macoff receving a smaller value then
-sizeof(struct virtio_net_hdr), and if po->has_vnet_hdr
-is set, an out-of-bounds write will occur when
-calling virtio_net_hdr_from_skb.
-
-The bug is fixed by converting netoff to unsigned int
-and checking if it exceeds USHRT_MAX.
-
-This addresses CVE-2020-14386
-
-
-diff -Naur linux-4.14.197.org/net/packet/af_packet.c linux-4.14.197/net/packet/af_packet.c
---- linux-4.14.197.org/net/packet/af_packet.c	2020-09-11 22:27:31.003458577 +0200
-+++ linux-4.14.197/net/packet/af_packet.c	2020-09-11 22:38:53.104021712 +0200
-@@ -2201,7 +2201,8 @@
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 	unsigned long status = TP_STATUS_USER;
--	unsigned short macoff, netoff, hdrlen;
-+	unsigned short macoff, hdrlen;
-+	unsigned int netoff;
- 	struct sk_buff *copy_skb = NULL;
- 	struct timespec ts;
- 	__u32 ts_status;
-@@ -2264,6 +2265,10 @@
- 		}
- 		macoff = netoff - maclen;
- 	}
-+	if (netoff > USHRT_MAX) {
-+		po->stats.stats1.tp_drops++;
-+		goto drop_n_restore;
-+	}
- 	if (po->tp_version <= TPACKET_V2) {
- 		if (macoff + snaplen > po->rx_ring.frame_size) {
- 			if (po->copy_thresh &&
diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
new file mode 100644
index 000000000..a66170ae5
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
@@ -0,0 +1,15 @@
+diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd
+index 87312f7..bb5cd4c 100644
+--- a/scripts/services/dhcpd
++++ b/scripts/services/dhcpd
+@@ -79,7 +79,9 @@ while (my $line = <STDIN>) {
+       ($line =~ /^Solicit message from/) or
+       ($line =~ /^Sending Advertise to/) or
+       ($line =~ /^pool [0-9a-f]+ /) or
+-      ($line =~ /^[^ ]* file: /)
++      ($line =~ /^[^ ]* file: /) or
++      ($line =~ /^reuse_lease: lease age \d+ (secs) under \d+% threshold, reply with unaltered, existing lease for/) or
++      0 # noop, but makes diffs easier when appending ignore statements
+       ) {
+       # Ignore these lines
+    } elsif ($line =~ s/Listening on\s+//) {
diff --git a/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch b/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
new file mode 100644
index 000000000..8ad0c3b3d
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
@@ -0,0 +1,14 @@
+diff -U 3 a/conf/logwatch.conf b/conf/logwatch.conf
+--- a/conf/logwatch.conf	Thu Sep 19 01:58:55 2019
++++ b/conf/logwatch.conf	Thu Nov 26 18:46:12 2020
+@@ -94,6 +94,10 @@
+                             # prints useful system configuration info.
+ Service = "-eximstats"      # Prevents execution of eximstats service, which
+                             # is a wrapper for the eximstats program.
++
++# Disabled: 'iptables'
++Service = "-iptables"
++
+ # If you only cared about FTP messages, you could use these 2 lines
+ # instead of the above:
+ #Service = ftpd-messages   # Processes ftpd messages in /var/log/messages
diff --git a/src/patches/vdr/vdr-2.4.1_replace_stime.patch b/src/patches/vdr/vdr-2.4.1_replace_stime.patch
deleted file mode 100644
index e0d1c1def..000000000
--- a/src/patches/vdr/vdr-2.4.1_replace_stime.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From dcfa8ba29f4c95edbdceb0f1bbae0e62fa40c4e2 Mon Sep 17 00:00:00 2001
-From: Manuel Reimer manuel.reimer@gmx.de
-Date: Sat, 14 Dec 2019 12:01:13 +0100
-Subject: [PATCH 1/2] Replace obsolete stime() function with clock_settime()
-
----
- eit.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/eit.c b/eit.c
-index 50d8229..82294dc 100644
---- a/eit.c
-+++ b/eit.c
-@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data)
-   if (abs(diff) > MAX_TIME_DIFF) {
-      mutex.Lock();
-      if (abs(diff) > MAX_ADJ_DIFF) {
--        if (stime(&dvbtim) == 0)
-+        timespec ts = {0};
-+        ts.tv_sec = dvbtim;
-+        if (clock_settime(CLOCK_REALTIME, &ts) == 0)
-            isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
-         else
-            esyslog("ERROR while setting system time: %m");
-
-From 3395a81a07416f54b0aa94ba709b902d72dacce7 Mon Sep 17 00:00:00 2001
-From: Manuel Reimer manuel.reimer@gmx.de
-Date: Sun, 15 Dec 2019 11:26:42 +0100
-Subject: [PATCH 2/2] Fix "struct timespec has more than one member" warning
-
----
- eit.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eit.c b/eit.c
-index 82294dc..098e627 100644
---- a/eit.c
-+++ b/eit.c
-@@ -391,7 +391,7 @@ cTDT::cTDT(const u_char *Data)
-   if (abs(diff) > MAX_TIME_DIFF) {
-      mutex.Lock();
-      if (abs(diff) > MAX_ADJ_DIFF) {
--        timespec ts = {0};
-+        timespec ts = {};
-         ts.tv_sec = dvbtim;
-         if (clock_settime(CLOCK_REALTIME, &ts) == 0)
-            isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
diff --git a/tools/checknewlog.pl b/tools/checknewlog.pl
index 0df390b5c..c1d80eaeb 100755
--- a/tools/checknewlog.pl
+++ b/tools/checknewlog.pl
@@ -28,7 +28,7 @@ foreach(@FILES) {
 #	print $_."\n";
    my $Found = 0;
-	if ( $_ =~ /$.log/ || $_ =~ /^.+/  || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/|| $_=~ /u-boot-.*-1/|| $_=~ /coreutils/ || $_=~ /cmake/ || $_=~ /libsigc/ || $_ eq 'FILES' ){
+	if ( $_ =~ /$.log/ || $_ =~ /^.+/  || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/|| $_=~ /u-boot-.*-1/|| $_=~ /coreutils/ || $_=~ /cmake/ || $_=~ /gdb/ || $_=~ /libsigc/ || $_ eq 'FILES' ){
    	next;
    } elsif ( $_=~ /missing_rootfile/ ){
    	print "Rootfile for $_ missing!\n";
diff --git a/tools/checkrootfiles b/tools/checkrootfiles
index d11ab8d5e..5e465700d 100755
--- a/tools/checkrootfiles
+++ b/tools/checkrootfiles
@@ -54,7 +54,7 @@ if [ "${?}" == "0" ]; then
    echo "Replace by xxxMACHINExxx !"
 fi
-grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude-dir oldcore --exclude-dir aarch64 >/dev/null 2>&1
+grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude gdb --exclude-dir oldcore --exclude-dir aarch64 >/dev/null 2>&1
 if [ "${?}" == "0" ]; then
    echo "Error! '/aarch64' in rootfiles files found!"
    grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude-dir oldcore --exclude-dir aarch64
hooks/post-receive
--
IPFire 2.x development tree

    