From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 25 Mar 2021 12:05:47 +0000 (-0400)
Subject: Merge pull request #8328 from idryzhov/7.5-backports-2021-03-24
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=18f209926fb659790926b82dd4e30727311d22aa;p=matthieu%2Ffrr.git

Merge pull request #8328 from idryzhov/7.5-backports-2021-03-24

7.5 backports
---

18f209926fb659790926b82dd4e30727311d22aa