Mbriskar windup 336 (memory tweaks)

DO NOT MERGE (mostly here to see how the CI server responds to this tweak).