Thanks. I agree. 3rd option would be to add the required patches to fix the issue. But I'm afraid cherry-picking them isn't trivial. Also they may need additional patches before you can apply them ...