backport has been merged upstream into 10.2 and 10.3: https://github.com/FRRouting/frr/commit/95128a75f79474c36e1fb9b8d742d4d7ca5049aa https://github.com/FRRouting/frr/commit/8efa737e7992b5fe48803911951855dc6a853208