This will make upgrade to v11.3.0 easier and follows upstream more
closely.
Fixes: #757
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
(cherry picked from commit 0dca1060fd48d261f4ffead6efebd16170014ee3)
[Add fixes]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>