Initial commit for Cake 2.3.9 raw
Fix initial conflicts