Merge branch 'foreign/zhaolei/reada' into for-chris-4.6