Merge pull request #8901 from neheb/mem