Merge pull request #3310 from yousong/mem