The last patch is not applying due to some changes in the module, here's the ...