Merging in changes from Rayman FX ELITE kernel