Still doing analysis. I am only attempting to backport one patch at a time and flash and test. I don't want to introduce too many changes at once without testing each one separately.