BZ899664
Merge pull request #516 from liweinan/BZ899664_Branch23

BZ899664