bz916799
Merge pull request #264 from liweinan/bz916799,Branch_2_3,revised

bz916799