merge with master05/02
Merged Jingxin.