Feature memory increase and d5

I (Steve) am not sure if this pull request is ready to go. Sean suggested using this branch in https://redmine.palantir.net/issues/20426#note-1