All patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: NJohn Audia <therealgraysky@proton.me>
(cherry picked from commit 913f160a)