Upstream and our fork are heavily diverged from each other. It may be worth to see if we can rebase our patches on a current version of upstream.