Backport two patches in order to fix it. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Link: https://github.com/openwrt/openwrt/pull/18600 Signed-off-by: Robert Marko <robimarko@gmail.com>
