I need someone to confirm that the cherry picked patches are OK since there were some conflicts I had to resolve.