Merge pull request #7182 from totten/4.6-gencode-mem