Don't use memory after we've freed it.
Merge branch 'develop' into new-split