bz916799
Merge pull request #257 from liweinan/BZ916799,B23

bz916799,Branch_2_3