Rebase of China's code on 2.4.9