Rebase of China's code on 2.4.9
Merge pull request #2 from corentinbaron/r2.4.9-ppc

Rebase of China's code on 2.4.9